[PATCH 4/5] d3d10/effect: Reduce duplication when releasing shader objects.

Nikolay Sivov nsivov at codeweavers.com
Thu Oct 28 02:46:38 CDT 2021


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/d3d10/d3d10_private.h |  1 +
 dlls/d3d10/effect.c        | 12 ++----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index f8e415f860b..7f83fb1182a 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -87,6 +87,7 @@ struct d3d10_effect_shader_variable
         ID3D10VertexShader *vs;
         ID3D10PixelShader *ps;
         ID3D10GeometryShader *gs;
+        IUnknown *object;
     } shader;
 
     unsigned int resource_count;
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 788b48e45ae..003060598a3 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -3126,18 +3126,10 @@ static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_vari
     switch (type)
     {
         case D3D10_SVT_VERTEXSHADER:
-            if (s->shader.vs)
-                ID3D10VertexShader_Release(s->shader.vs);
-            break;
-
         case D3D10_SVT_PIXELSHADER:
-            if (s->shader.ps)
-                ID3D10PixelShader_Release(s->shader.ps);
-            break;
-
         case D3D10_SVT_GEOMETRYSHADER:
-            if (s->shader.gs)
-                ID3D10GeometryShader_Release(s->shader.gs);
+            if (s->shader.object)
+                IUnknown_Release(s->shader.object);
             break;
 
         default:
-- 
2.33.0




More information about the wine-devel mailing list