glsl: Fix gl_program::OutputsWritten computation for dual-source blending.
In the fragment shader OutputsWritten is a bitset of FRAG_RESULT_* enumerants, which represent the location of each color output written by the shader. The secondary and primary color outputs of a given render target using dual-source blending have the same location, so the 'idx' computation below will give the wrong bit as result if the 'var->data.index' term is non-zero -- E.g. if the shader writes the primary and secondary colors of the FRAG_RESULT_COLOR output, ir_set_program_inouts will think that the shader writes both FRAG_RESULT_COLOR and FRAG_RESULT_SAMPLE_MASK, which is just bogus. That would cause the brw_wm_prog_key::nr_color_regions computation done in the i965 driver during fragment shader precompilation to be wrong, which currently leads to unnecessary recompilation of shaders that use dual-source blending, and triggers an assertion failure in fs_visitor::emit_fb_writes() on my i965-fb-fetch branch. Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
@@ -96,7 +96,7 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len,
|
||||
for (int i = 0; i < len; i++) {
|
||||
assert(var->data.location != -1);
|
||||
|
||||
int idx = var->data.location + var->data.index + offset + i;
|
||||
int idx = var->data.location + offset + i;
|
||||
bool is_patch_generic = var->data.patch &&
|
||||
idx != VARYING_SLOT_TESS_LEVEL_INNER &&
|
||||
idx != VARYING_SLOT_TESS_LEVEL_OUTER;
|
||||
|
@@ -586,9 +586,7 @@ bool
|
||||
st_translate_fragment_program(struct st_context *st,
|
||||
struct st_fragment_program *stfp)
|
||||
{
|
||||
GLuint outputMapping[2 * FRAG_RESULT_MAX] =
|
||||
{ 0 /* XXX - Avoid temporary regression due to bogus OutputsWritten
|
||||
* bitset. */ };
|
||||
GLuint outputMapping[2 * FRAG_RESULT_MAX];
|
||||
GLuint inputMapping[VARYING_SLOT_MAX];
|
||||
GLuint inputSlotToAttr[VARYING_SLOT_MAX];
|
||||
GLuint interpMode[PIPE_MAX_SHADER_INPUTS]; /* XXX size? */
|
||||
|
Reference in New Issue
Block a user