October 2009 - Wine-commits

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsDepthStencilView().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 7b91b36d93c57e239cb477b176f6a1251b428520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b91b36d93c57e239cb477b17… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:11:34 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsDepthStencilView(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ca92f18..36941da 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2596,9 +2596,14 @@ static struct ID3D10EffectRenderTargetViewVariable * STDMETHODCALLTYPE d3d10_eff static struct ID3D10EffectDepthStencilViewVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsDepthStencilView( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_depth_stencil_view_variable_vtbl) + return (ID3D10EffectDepthStencilViewVariable *)This; + + return (ID3D10EffectDepthStencilViewVariable *)&null_depth_stencil_view_variable; } static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variable_AsConstantBuffer(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsConstantBuffer().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: b1e56fae0118578836c41a06861f1d6a292bff92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e56fae0118578836c41a068… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:12:11 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsConstantBuffer(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 36941da..acb0f23 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2609,9 +2609,14 @@ static struct ID3D10EffectDepthStencilViewVariable * STDMETHODCALLTYPE d3d10_eff static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variable_AsConstantBuffer( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl) + return (ID3D10EffectConstantBuffer *)This; + + return (ID3D10EffectConstantBuffer *)&null_local_buffer; } static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsShader(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsBlend().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 53e00e12ba4d6a063bdccf523cf62444c04f4eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e00e12ba4d6a063bdccf523… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:12:29 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsBlend(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index acb0f23..06c9973 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2629,9 +2629,14 @@ static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_variab static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsBlend(ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_blend_variable_vtbl) + return (ID3D10EffectBlendVariable *)This; + + return (ID3D10EffectBlendVariable *)&null_blend_variable; } static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsDepthStencil(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsDepthStencil().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 48673eec293cb6d9816583fa8510e0cb0e7f492a URL: http://source.winehq.org/git/wine.git/?a=commit;h=48673eec293cb6d9816583fa8… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:12:53 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsDepthStencil(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 06c9973..b34df43 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2642,9 +2642,14 @@ static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_variabl static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsDepthStencil( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_depth_stencil_variable_vtbl) + return (ID3D10EffectDepthStencilVariable *)This; + + return (ID3D10EffectDepthStencilVariable *)&null_depth_stencil_variable; } static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsRasterizer(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsRasterizer().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 3db6ec57ff113fac9bba6b6a1e1b63caa7835a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db6ec57ff113fac9bba6b6a1… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:13:12 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsRasterizer(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b34df43..8c59573 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2655,9 +2655,14 @@ static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_ static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsRasterizer( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_rasterizer_variable_vtbl) + return (ID3D10EffectRasterizerVariable *)This; + + return (ID3D10EffectRasterizerVariable *)&null_rasterizer_variable; } static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsSampler(

1 0

Henri Verbeet : wined3d: Restore the thread's GL context on context_release () if it wasn't created by wined3d.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: c0050b8ec91b60d6d6a646095cc22f9856eafeda URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0050b8ec91b60d6d6a646095… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 28 11:00:13 2009 +0100 wined3d: Restore the thread's GL context on context_release() if it wasn't created by wined3d. The background on this is that some applications use OpenGL and DirectDraw/Direct3D on the same thread, typically using OpenGL for rendering and DirectDraw to get the amount of available video memory. This means that we might replace the application's current GL context with one with a completely different state, but also that our current GL context might not be what we think it is. --- dlls/wined3d/context.c | 50 +++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1362352..deafe72 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -843,7 +843,37 @@ void context_release(struct wined3d_context *context) WARN("Context %p is not the current context.\n", context); } - --context->level; + if (!--context->level && context->restore_ctx) + { + TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc); + if (!pwglMakeCurrent(context->restore_dc, context->restore_ctx)) + { + DWORD err = GetLastError(); + ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", + context->restore_ctx, context->restore_dc, err); + } + context->restore_ctx = NULL; + context->restore_dc = NULL; + } +} + +static void context_enter(struct wined3d_context *context) +{ + TRACE("Entering context %p, level %u.\n", context, context->level + 1); + + if (!context->level++) + { + const struct wined3d_context *current_context = context_get_current(); + HGLRC current_gl = pwglGetCurrentContext(); + + if (current_gl && (!current_context || current_context->glCtx != current_gl)) + { + TRACE("Another GL context (%p on device context %p) is already current.\n", + current_gl, pwglGetCurrentDC()); + context->restore_ctx = current_gl; + context->restore_dc = pwglGetCurrentDC(); + } + } } /***************************************************************************** @@ -1347,10 +1377,13 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface list_init(&ret->fbo_list); list_init(&ret->fbo_destroy_list); + context_enter(ret); + /* Set up the context defaults */ if (!context_set_current(ret)) { ERR("Cannot activate context to set up defaults\n"); + context_release(ret); goto out; } @@ -1447,8 +1480,6 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); - ++ret->level; - return ret; out: @@ -2078,9 +2109,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurfac TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); context = FindContext(This, target, tid); - ++context->level; - TRACE("Found context %p, level %u.\n", context, context->level); - + context_enter(context); if (!context->valid) return context; gl_info = context->gl_info; @@ -2104,6 +2133,15 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurfac This->highest_dirty_ps_const = This->d3d_pshader_constantF; } } + else if (context->restore_ctx) + { + if (!pwglMakeCurrent(context->hdc, context->glCtx)) + { + DWORD err = GetLastError(); + ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", + context->hdc, context->glCtx, err); + } + } switch (usage) { case CTXUSAGE_CLEAR: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0617bbc..d8f65b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1060,6 +1060,8 @@ struct wined3d_context /* The actual opengl context */ UINT level; + HGLRC restore_ctx; + HDC restore_dc; HGLRC glCtx; HWND win_handle; HDC hdc;

1 0

Henri Verbeet : wined3d: Rename DestroyContext() to context_destroy().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: e6ca176a482090f4688a98109334e026936c2b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ca176a482090f4688a98109… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 28 11:00:14 2009 +0100 wined3d: Rename DestroyContext() to context_destroy(). --- dlls/wined3d/context.c | 10 +++++----- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/swapchain.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index deafe72..7dc7c0e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1501,7 +1501,7 @@ out: * destroyed or unset. context is not a valid pointer after that call. * * Similar to the former call this isn't a performance critical function. A - * helper function for DestroyContext. + * helper function for context_destroy(). * * Params: * This: Device to activate the context for @@ -1556,16 +1556,16 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, struct wined3d_cont } /***************************************************************************** - * DestroyContext + * context_destroy * - * Destroys a wineD3DContext + * Destroys a wined3d context * * Params: * This: Device to activate the context for * context: Context to destroy * *****************************************************************************/ -void DestroyContext(IWineD3DDeviceImpl *This, struct wined3d_context *context) +void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) { BOOL destroy; @@ -1904,7 +1904,7 @@ retry: || This->pbufferWidth < targetimpl->currentDesc.Width || This->pbufferHeight < targetimpl->currentDesc.Height) { - if (This->pbufferContext) DestroyContext(This, This->pbufferContext); + if (This->pbufferContext) context_destroy(This, This->pbufferContext); /* The display is irrelevant here, the window is 0. But * context_create() needs a valid X connection. Create the context diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f03adb..66ccc15 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1307,7 +1307,7 @@ error: if(object->context && object->context[0]) { context_release(object->context[0]); - DestroyContext(This, object->context[0]); + context_destroy(This, object->context[0]); } if (object->frontBuffer) IWineD3DSurface_Release(object->frontBuffer); HeapFree(GetProcessHeap(), 0, object); @@ -2011,7 +2011,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, } /* Delete the pbuffer context if there is any */ - if(This->pbufferContext) DestroyContext(This, This->pbufferContext); + if(This->pbufferContext) context_destroy(This, This->pbufferContext); /* Delete the mouse cursor texture */ if(This->cursorTexture) { @@ -6658,8 +6658,9 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_ context_release(context); - while(This->numContexts) { - DestroyContext(This, This->contexts[0]); + while (This->numContexts) + { + context_destroy(This, This->contexts[0]); } HeapFree(GetProcessHeap(), 0, swapchain->context); swapchain->context = NULL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 456440b..cab916b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -76,7 +76,7 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) for (i = 0; i < This->num_contexts; ++i) { - DestroyContext(This->wineD3DDevice, This->context[i]); + context_destroy(This->wineD3DDevice, This->context[i]); } /* Restore the screen resolution if we rendered in fullscreen * This will restore the screen resolution to what it was before creating the swapchain. In case of d3d8 and d3d9 @@ -354,7 +354,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_SetDestWindowOverride(IWineD3DSwapCh memcpy(mem, r.pBits, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); IWineD3DSurface_UnlockRect(This->backBuffer[0]); - DestroyContext(This->wineD3DDevice, This->context[0]); + context_destroy(This->wineD3DDevice, This->context[0]); This->context[0] = context_create(This->wineD3DDevice, (IWineD3DSurfaceImpl *)This->frontBuffer, This->win_handle, FALSE /* pbuffer */, &This->presentParms); context_release(This->context[0]); @@ -408,7 +408,7 @@ struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *i newArray = HeapAlloc(GetProcessHeap(), 0, sizeof(*newArray) * This->num_contexts + 1); if(!newArray) { ERR("Out of memory when trying to allocate a new context array\n"); - DestroyContext(This->wineD3DDevice, ctx); + context_destroy(This->wineD3DDevice, ctx); return NULL; } memcpy(newArray, This->context, sizeof(*newArray) * This->num_contexts); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8f65b0..3c1e631 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1164,7 +1164,6 @@ typedef enum ContextUsage { CTXUSAGE_CLEAR = 4, /* Drawable and states are set up for clearing */ } ContextUsage; -void DestroyContext(IWineD3DDeviceImpl *This, struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurface *target, enum ContextUsage usage) DECLSPEC_HIDDEN; void context_alloc_event_query(struct wined3d_context *context, @@ -1180,6 +1179,7 @@ void context_attach_surface_fbo(const struct wined3d_context *context, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) DECLSPEC_HIDDEN; struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *present_parameters) DECLSPEC_HIDDEN; +void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) DECLSPEC_HIDDEN; void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN;

1 0

Rico Schüller : d3d10: Fix a HeapFree() in d3d10_effect_Release().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 607a643bcc3b38bce1dd4794ac7ec03140a218a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=607a643bcc3b38bce1dd4794a… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:10:19 2009 +0100 d3d10: Fix a HeapFree() in d3d10_effect_Release(). --- dlls/d3d10/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ac3d972..d4c7310 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1737,7 +1737,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { d3d10_effect_variable_destroy(&This->local_variables[i]); } - HeapFree(GetProcessHeap(), 0, &This->local_variables); + HeapFree(GetProcessHeap(), 0, This->local_variables); } if (This->local_buffers)

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsString().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 2c3674d6ce75e3fb7669f1cbe0cb2756dfab348b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3674d6ce75e3fb7669f1cbe… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:10:31 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsString(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d4c7310..b52656b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2557,9 +2557,14 @@ static struct ID3D10EffectMatrixVariable * STDMETHODCALLTYPE d3d10_effect_variab static struct ID3D10EffectStringVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsString( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_string_variable_vtbl) + return (ID3D10EffectStringVariable *)This; + + return (ID3D10EffectStringVariable *)&null_string_variable; } static struct ID3D10EffectShaderResourceVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsShaderResource(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :AsShaderResource().
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: fee2d5320433ebf7784ca71560ddd1de5b693921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee2d5320433ebf7784ca7156… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 27 20:10:48 2009 +0100 d3d10: Implement ID3D10EffectVariable::AsShaderResource(). --- dlls/d3d10/effect.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b52656b..c4391cf 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2570,9 +2570,14 @@ static struct ID3D10EffectStringVariable * STDMETHODCALLTYPE d3d10_effect_variab static struct ID3D10EffectShaderResourceVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsShaderResource( ID3D10EffectVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return NULL; + TRACE("iface %p\n", iface); + + if (This->vtbl == (ID3D10EffectVariableVtbl *)&d3d10_effect_shader_resource_variable_vtbl) + return (ID3D10EffectShaderResourceVariable *)This; + + return (ID3D10EffectShaderResourceVariable *)&null_shader_resource_variable; } static struct ID3D10EffectRenderTargetViewVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsRenderTargetView(

1 0