---
 dlls/wined3d/pixelshader.c |    2 +-
 dlls/wined3d/utils.c       |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 6ac145c..b26b978 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -362,7 +362,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp
     UINT i;
     IWineD3DBaseTextureImpl *tex;
 
-    memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set */
+    memset(args, 0, sizeof(*args));
     args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0;
     args->np2_fixup = 0;
 
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index d2631ea..8fcae7b 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -2170,6 +2170,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
     DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2;
     IWineD3DDeviceImpl *device = stateblock->wineD3DDevice;
 
+    memset(settings, 0, sizeof(*settings));
+
     for(i = 0; i < GL_LIMITS(texture_stages); i++) {
         IWineD3DBaseTextureImpl *texture;
         settings->op[i].padding = 0;
-- 
1.5.6.3