diff options
| author | Kenneth Graunke <[email protected]> | 2014-11-08 02:01:32 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-11-27 20:25:19 -0800 |
| commit | a0f8b363c0976ab3b58b76df687e664b0c99d6c9 (patch) | |
| tree | 03e3d5aeec398cd83151a7b0c96a4dfe486af7d7 /src/mesa | |
| parent | cea37f0911cf2d88f11a7a2afe4ab2351601571a (diff) | |
i965/fs: Pass key->render_to_fbo via src1 of FS_OPCODE_DDY_*.
This means the generator doesn't have to look at the key, which is a
little nicer - we're pretty close to no key dependencies at all.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_defines.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index e7f6a2bad8e..adcf1db6147 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -912,6 +912,10 @@ enum opcode { FS_OPCODE_DDX_COARSE, FS_OPCODE_DDX_FINE, + /** + * Compute dFdy(), dFdyCoarse(), or dFdyFine(). + * src1 is an immediate storing the key->render_to_fbo boolean. + */ FS_OPCODE_DDY_COARSE, FS_OPCODE_DDY_FINE, FS_OPCODE_PIXEL_X, diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index 27ba0bbadb8..16aa268946c 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -1860,13 +1860,8 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width) break; case FS_OPCODE_DDY_COARSE: case FS_OPCODE_DDY_FINE: - /* Make sure fp->UsesDFdy flag got set (otherwise there's no - * guarantee that key->render_to_fbo is set). - */ - assert(stage == MESA_SHADER_FRAGMENT && - ((gl_fragment_program *) prog)->UsesDFdy); - generate_ddy(inst->opcode, dst, src[0], - ((brw_wm_prog_key * const) this->key)->render_to_fbo); + assert(src[1].file == BRW_IMMEDIATE_VALUE); + generate_ddy(inst->opcode, dst, src[0], src[1].dw1.ud); break; case SHADER_OPCODE_GEN4_SCRATCH_WRITE: diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 1b0edaf3cdb..0b62496b81b 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -620,17 +620,17 @@ fs_visitor::visit(ir_expression *ir) case ir_unop_dFdy: /* Select one of the two opcodes based on the glHint value. */ if (fs_key->high_quality_derivatives) - emit(FS_OPCODE_DDY_FINE, this->result, op[0]); + emit(FS_OPCODE_DDY_FINE, result, op[0], fs_reg(fs_key->render_to_fbo)); else - emit(FS_OPCODE_DDY_COARSE, this->result, op[0]); + emit(FS_OPCODE_DDY_COARSE, result, op[0], fs_reg(fs_key->render_to_fbo)); break; case ir_unop_dFdy_coarse: - emit(FS_OPCODE_DDY_COARSE, this->result, op[0]); + emit(FS_OPCODE_DDY_COARSE, result, op[0], fs_reg(fs_key->render_to_fbo)); break; case ir_unop_dFdy_fine: - emit(FS_OPCODE_DDY_FINE, this->result, op[0]); + emit(FS_OPCODE_DDY_FINE, result, op[0], fs_reg(fs_key->render_to_fbo)); break; case ir_binop_add: |