=?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: d3dx9: Remove unused variable.
Alexandre Julliard
julliard at winehq.org
Tue Jan 8 13:58:43 CST 2013
Module: wine
Branch: master
Commit: 7ff6afd091d51c2df2b2632350a5832fd2c7ee04
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff6afd091d51c2df2b2632350a5832fd2c7ee04
Author: Rico Schüller <kgbricola at web.de>
Date: Mon Jan 7 21:57:33 2013 +0100
d3dx9: Remove unused variable.
---
dlls/d3dx9_36/shader.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index ea459ce..3e28a03 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -1736,10 +1736,9 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT
HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count)
{
- HRESULT hr;
UINT i, sampler_count = 0;
UINT size;
- LPCSTR data;
+ const char *data;
const D3DXSHADER_CONSTANTTABLE *ctab_header;
const D3DXSHADER_CONSTANTINFO *constant_info;
@@ -1747,8 +1746,8 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
if (count) *count = 0;
- hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), (LPCVOID *)&data, &size);
- if (hr != D3D_OK) return D3D_OK;
+ if (D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), (const void **)&data, &size) != D3D_OK)
+ return D3D_OK;
if (size < sizeof(*ctab_header)) return D3D_OK;
More information about the wine-cvs
mailing list