Henri Verbeet : wined3d: Remove some unused fields from the shader backend caps.
Alexandre Julliard
julliard at winehq.org
Mon May 3 11:54:05 CDT 2010
Module: wine
Branch: master
Commit: c9e7561b349697edd644966509ba881a29b8fbd1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e7561b349697edd644966509ba881a29b8fbd1
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 29 23:41:29 2010 +0200
wined3d: Remove some unused fields from the shader backend caps.
---
dlls/wined3d/directx.c | 7 -------
dlls/wined3d/wined3d_private.h | 8 --------
2 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index a0f1c7c..08dcafd 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4574,13 +4574,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
pCaps->MaxTextureBlendStages = fragment_caps.MaxTextureBlendStages;
pCaps->MaxSimultaneousTextures = fragment_caps.MaxSimultaneousTextures;
- pCaps->VS20Caps = shader_caps.VS20Caps;
- pCaps->MaxVShaderInstructionsExecuted = shader_caps.MaxVShaderInstructionsExecuted;
- pCaps->MaxVertexShader30InstructionSlots= shader_caps.MaxVertexShader30InstructionSlots;
- pCaps->PS20Caps = shader_caps.PS20Caps;
- pCaps->MaxPShaderInstructionsExecuted = shader_caps.MaxPShaderInstructionsExecuted;
- pCaps->MaxPixelShader30InstructionSlots = shader_caps.MaxPixelShader30InstructionSlots;
-
/* The following caps are shader specific, but they are things we cannot detect, or which
* are the same among all shader models. So to avoid code duplication set the shader version
* specific, but otherwise constant caps here
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c316a4b..8fb4dfb 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -645,14 +645,6 @@ struct shader_caps {
float PixelShader1xMaxValue;
DWORD MaxPixelShaderConst;
- WINED3DVSHADERCAPS2_0 VS20Caps;
- WINED3DPSHADERCAPS2_0 PS20Caps;
-
- DWORD MaxVShaderInstructionsExecuted;
- DWORD MaxPShaderInstructionsExecuted;
- DWORD MaxVertexShader30InstructionSlots;
- DWORD MaxPixelShader30InstructionSlots;
-
BOOL VSClipping;
};
More information about the wine-cvs
mailing list