[PATCH 4/5] wined3d: Access reg_maps though ins->ctx in get_bool_const().
Henri Verbeet
hverbeet at codeweavers.com
Thu Oct 28 04:49:59 CDT 2010
---
dlls/wined3d/arb_program_shader.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 88f0ec0..39b7015 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5034,13 +5034,14 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, DWORD idx)
{
- BOOL vshader = shader_is_vshader_version(This->baseShader.reg_maps.shader_version.type);
+ const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps;
+ BOOL vshader = shader_is_vshader_version(reg_maps->shader_version.type);
WORD bools = 0;
WORD flag = (1 << idx);
const local_constant *constant;
struct shader_arb_ctx_priv *priv = ins->ctx->backend_data;
- if(This->baseShader.reg_maps.local_bool_consts & flag)
+ if (reg_maps->local_bool_consts & flag)
{
/* What good is a if(bool) with a hardcoded local constant? I don't know, but handle it */
LIST_FOR_EACH_ENTRY(constant, &This->baseShader.constantsB, local_constant, entry)
--
1.7.2.2
More information about the wine-patches
mailing list