Module: wine Branch: master Commit: d7b087618b3fdf48d0539d82310f18530c2397b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b087618b3fdf48d0539d8231...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Oct 29 10:37:09 2009 +0100
wined3d: Remove some unused GLINFO_LOCATION definitions.
---
dlls/wined3d/baseshader.c | 3 +-- dlls/wined3d/cubetexture.c | 6 ------ dlls/wined3d/pixelshader.c | 2 -- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/texture.c | 6 ------ dlls/wined3d/vertexdeclaration.c | 2 -- dlls/wined3d/vertexshader.c | 2 -- dlls/wined3d/volumetexture.c | 2 -- 8 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a6bea57..bb94a5a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1391,7 +1391,6 @@ static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;}
-#define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { @@ -1400,7 +1399,7 @@ static void shader_none_get_caps(WINED3DDEVTYPE devtype, pCaps->PixelShaderVersion = 0; pCaps->PixelShader1xMaxValue = 0.0f; } -#undef GLINFO_LOCATION + static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) { if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ade200f..f22845b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -27,8 +27,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);
-#define GLINFO_LOCATION (*gl_info) - static void cubetexture_internal_preload(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb) { /* Override the IWineD3DResource Preload method. */ @@ -141,14 +139,10 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) basetexture_cleanup((IWineD3DBaseTexture *)This); }
-#undef GLINFO_LOCATION - /* ******************************************* IWineD3DCubeTexture IUnknown parts follow ******************************************* */
-#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DCubeTextureImpl_QueryInterface(IWineD3DCubeTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index c82faa5..09fbe24 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -33,8 +33,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
-#define GLINFO_LOCATION ((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info - static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { TRACE("iface %p, riid %s, ppobj %p\n", iface, debugstr_guid(riid), ppobj);
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 892ac89..2ab1fd9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -26,7 +26,6 @@ #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info
static const DWORD pixel_states_render[] = { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index eae78c0..b568005 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -27,8 +27,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);
-#define GLINFO_LOCATION (*gl_info) - static void texture_internal_preload(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb) { /* Override the IWineD3DResource PreLoad method. */ @@ -128,14 +126,10 @@ static void texture_cleanup(IWineD3DTextureImpl *This) basetexture_cleanup((IWineD3DBaseTexture *)This); }
-#undef GLINFO_LOCATION - /* ******************************************* IWineD3DTexture IUnknown parts follow ******************************************* */
-#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DTextureImpl_QueryInterface(IWineD3DTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 6d617ed..88b3f27 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -27,8 +27,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl);
-#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info - static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { TRACE(" format: %s (%#x)\n", debug_d3dformat(element->format), element->format); TRACE(" input_slot: %u\n", element->input_slot); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 3712bee..14779a5 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -33,8 +33,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
-#define GLINFO_LOCATION ((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info - static void vshader_set_limits(IWineD3DVertexShaderImpl *This) { DWORD shader_version = WINED3D_SHADER_VERSION(This->baseShader.reg_maps.shader_version.major, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index cad7360..a21211d 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -103,8 +103,6 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) IWineD3DTexture IUnknown parts follow ******************************************* */
-#define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info - static HRESULT WINAPI IWineD3DVolumeTextureImpl_QueryInterface(IWineD3DVolumeTexture *iface, REFIID riid, LPVOID *ppobj) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface;