wined3d: Handle a few "silent" FIXMEs more consistent with the rest of the code.
Henri Verbeet
hverbeet at codeweavers.com
Mon Dec 1 08:32:14 CST 2008
Also avoids needlessly initializing static variables.
---
dlls/wined3d/device.c | 28 ++++++++++++++++------------
dlls/wined3d/drawprim.c | 18 +++++++++---------
dlls/wined3d/state.c | 13 +++++++------
dlls/wined3d/swapchain_base.c | 7 ++++---
4 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 855bea5..e73a4f6 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5767,10 +5767,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetCurrentTexturePalette(IWineD3DDevi
static HRESULT WINAPI IWineD3DDeviceImpl_SetSoftwareVertexProcessing(IWineD3DDevice *iface, BOOL bSoftware) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- static BOOL showFixmes = TRUE;
- if (showFixmes) {
+ static BOOL warned;
+ if (!warned)
+ {
FIXME("(%p) : stub\n", This);
- showFixmes = FALSE;
+ warned = TRUE;
}
This->softwareVertexProcessing = bSoftware;
@@ -5780,10 +5781,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetSoftwareVertexProcessing(IWineD3DD
static BOOL WINAPI IWineD3DDeviceImpl_GetSoftwareVertexProcessing(IWineD3DDevice *iface) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- static BOOL showFixmes = TRUE;
- if (showFixmes) {
+ static BOOL warned;
+ if (!warned)
+ {
FIXME("(%p) : stub\n", This);
- showFixmes = FALSE;
+ warned = TRUE;
}
return This->softwareVertexProcessing;
}
@@ -5809,11 +5811,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface
static HRESULT WINAPI IWineD3DDeviceImpl_SetNPatchMode(IWineD3DDevice *iface, float nSegments) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- static BOOL showfixmes = TRUE;
+ static BOOL warned;
if(nSegments != 0.0f) {
- if( showfixmes) {
+ if (!warned)
+ {
FIXME("(%p) : stub nSegments(%f)\n", This, nSegments);
- showfixmes = FALSE;
+ warned = TRUE;
}
}
return WINED3D_OK;
@@ -5821,10 +5824,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetNPatchMode(IWineD3DDevice *iface,
static float WINAPI IWineD3DDeviceImpl_GetNPatchMode(IWineD3DDevice *iface) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- static BOOL showfixmes = TRUE;
- if( showfixmes) {
+ static BOOL warned;
+ if (!warned)
+ {
FIXME("(%p) : stub returning(%f)\n", This, 0.0f);
- showfixmes = FALSE;
+ warned = TRUE;
}
return 0.0f;
}
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 0b4fc71..e169587 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -864,10 +864,10 @@ void drawPrimitive(IWineD3DDevice *iface,
if(!use_vs(This)) {
if(!This->strided_streams.u.s.position_transformed && This->activeContext->num_untracked_materials &&
This->stateBlock->renderState[WINED3DRS_LIGHTING]) {
- static BOOL first = TRUE;
- if(first) {
+ static BOOL warned;
+ if (!warned) {
FIXME("Using software emulation because not all material properties could be tracked\n");
- first = FALSE;
+ warned = TRUE;
} else {
TRACE("Using software emulation because not all material properties could be tracked\n");
}
@@ -877,10 +877,10 @@ void drawPrimitive(IWineD3DDevice *iface,
/* Either write a pipeline replacement shader or convert the specular alpha from unsigned byte
* to a float in the vertex buffer
*/
- static BOOL first = TRUE;
- if(first) {
+ static BOOL warned;
+ if (!warned) {
FIXME("Using software emulation because manual fog coordinates are provided\n");
- first = FALSE;
+ warned = TRUE;
} else {
TRACE("Using software emulation because manual fog coordinates are provided\n");
}
@@ -897,10 +897,10 @@ void drawPrimitive(IWineD3DDevice *iface,
if (This->useDrawStridedSlow || emulation) {
/* Immediate mode drawing */
if(use_vs(This)) {
- static BOOL first = TRUE;
- if(first) {
+ static BOOL warned;
+ if (!warned) {
FIXME("Using immediate mode with vertex shaders for half float emulation\n");
- first = FALSE;
+ warned = TRUE;
} else {
TRACE("Using immediate mode with vertex shaders for half float emulation\n");
}
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 5d8d84a..1132fbc 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1566,10 +1566,10 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win
if(stateblock->renderState[WINED3DRS_LASTPIXEL]) {
TRACE("Last Pixel Drawing Enabled\n");
} else {
- static BOOL first = TRUE;
- if(first) {
+ static BOOL warned;
+ if (!warned) {
FIXME("Last Pixel Drawing Disabled, not handled yet\n");
- first = FALSE;
+ warned = TRUE;
} else {
TRACE("Last Pixel Drawing Disabled, not handled yet\n");
}
@@ -4127,10 +4127,11 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte
checkGLcall("glWeightPointerARB");
if((sd->u.s.blendMatrixIndices.lpData) || (sd->u.s.blendMatrixIndices.VBO)){
- static BOOL showfixme = TRUE;
- if(showfixme){
+ static BOOL warned;
+ if (!warned)
+ {
FIXME("blendMatrixIndices support\n");
- showfixme = FALSE;
+ warned = TRUE;
}
}
} else {
diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c
index 363331c..7272c95 100644
--- a/dlls/wined3d/swapchain_base.c
+++ b/dlls/wined3d/swapchain_base.c
@@ -122,13 +122,14 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface,
HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) {
IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
- static BOOL showFixmes = TRUE;
+ static BOOL warned;
pRasterStatus->InVBlank = TRUE;
pRasterStatus->ScanLine = 0;
/* No openGL equivalent */
- if(showFixmes) {
+ if (!warned)
+ {
FIXME("(%p) : stub (once)\n", This);
- showFixmes = FALSE;
+ warned = TRUE;
}
return WINED3D_OK;
}
--
1.5.6.4
--------------020302000009070307040305--
More information about the wine-patches
mailing list