[WINESYNC] wined3d: Use gl_info from the wined3d_shader_context in sh…

…ader_hw_sample(). For simplicity. Signed-off-by: Henri Verbeet <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 9d2f4cdbdd5db84cc67e7d6c032c7df0cd5bc0f4 by Henri Verbeet <[email protected]>
DarkFire01 · Sep 14, 2023 · d14e53d · d14e53d
1 parent 5e7e4c3
commit d14e53d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/dll/directx/wine/wined3d/arb_program_shader.c b/dll/directx/wine/wined3d/arb_program_shader.c
@@ -1416,9 +1416,6 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD
     struct shader_arb_ctx_priv *priv = ins->ctx->backend_data;
     const char *mod;
     BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type);
-    const struct wined3d_shader *shader;
-    const struct wined3d_device *device;
-    const struct wined3d_gl_info *gl_info;
     const char *tex_dst = dst_str;
     struct color_fixup_masks masks;
 
@@ -1432,12 +1429,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD
             break;
 
         case WINED3D_SHADER_RESOURCE_TEXTURE_2D:
-            shader = ins->ctx->shader;
-            device = shader->device;
-            gl_info = &device->adapter->gl_info;
-
             if (pshader && priv->cur_ps_args->super.np2_fixup & (1u << sampler_idx)
-                    && gl_info->supported[ARB_TEXTURE_RECTANGLE])
+                    && ins->ctx->gl_info->supported[ARB_TEXTURE_RECTANGLE])
                 tex_type = "RECT";
             else
                 tex_type = "2D";

diff --git a/sdk/tools/winesync/wined3d.cfg b/sdk/tools/winesync/wined3d.cfg
@@ -3,4 +3,4 @@ directories:
 files:
   include/wine/wined3d.h: sdk/include/reactos/wine/wined3d.h
 tags:
-  wine: f31ed9837a7285b80bb5d6fa76372ad9168bd798
+  wine: 9d2f4cdbdd5db84cc67e7d6c032c7df0cd5bc0f4