Henri Verbeet : wined3d: Access reg_maps though ins-> ctx in get_loop_control_const().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f216dba1e39de775165fc1e4f3b43c8f4e0e28e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f216dba1e39de775165fc1e4f3...

Author: Henri Verbeet 
Date:   Thu Oct 28 11:50:00 2010 +0200

wined3d: Access reg_maps though ins->ctx in get_loop_control_const().

---

dlls/wined3d/arb_program_shader.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 39b7015..a93327e 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5065,11 +5065,12 @@ static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins,
 static void get_loop_control_const(const struct wined3d_shader_instruction *ins,
         IWineD3DBaseShaderImpl *This, UINT idx, struct wined3d_shader_loop_control *loop_control)
 {
+    const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps;
     struct shader_arb_ctx_priv *priv = ins->ctx->backend_data;

/* Integer constants can either be a local constant, or they can be stored in the shader
      * type specific compile args. */
-    if (This->baseShader.reg_maps.local_int_consts & (1 << idx))
+    if (reg_maps->local_int_consts & (1 << idx))
     {
         const local_constant *constant;

@@ -5092,7 +5093,7 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins,
         return;
     }

-    switch (This->baseShader.reg_maps.shader_version.type)
+    switch (reg_maps->shader_version.type)
     {
         case WINED3D_SHADER_TYPE_VERTEX:
             /* Count and aL start value are unsigned */
@@ -5109,7 +5110,7 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins,
             break;

default:
-            FIXME("Unhandled shader type %#x.\n", This->baseShader.reg_maps.shader_version.type);
+            FIXME("Unhandled shader type %#x.\n", reg_maps->shader_version.type);
             break;
     }
 }