summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-11-23 23:08:10 -0800
committerKenneth Graunke <[email protected]>2014-11-24 15:30:09 -0800
commitd54925df9c9c024c06b7d54334d5e7a1035bcaf8 (patch)
tree4810b9ee6067b95a453b89d12d9c44da280c8b99 /src/mesa/drivers/dri
parent880424b8ad33f075a5ba0edef2cfd88072cfb387 (diff)
i965: Move brw->precompile checks out a level.
brw_shader_precompile should just do a precompile; it makes more sense for the caller to decide whether we should do one. Simpler. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Kristian Høgsberg <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/brw_shader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index 10f8db7e998..78db48420b4 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -59,13 +59,13 @@ brw_shader_precompile(struct gl_context *ctx, struct gl_shader_program *prog)
{
struct brw_context *brw = brw_context(ctx);
- if (brw->precompile && !brw_fs_precompile(ctx, prog))
+ if (!brw_fs_precompile(ctx, prog))
return false;
- if (brw->precompile && !brw_gs_precompile(ctx, prog))
+ if (!brw_gs_precompile(ctx, prog))
return false;
- if (brw->precompile && !brw_vs_precompile(ctx, prog))
+ if (!brw_vs_precompile(ctx, prog))
return false;
return true;
@@ -255,7 +255,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
}
}
- if (!brw_shader_precompile(ctx, shProg))
+ if (brw->precompile && !brw_shader_precompile(ctx, shProg))
return false;
return true;