Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
This commit is contained in:
commit
e128cc205e
|
@ -58,6 +58,7 @@ tbd
|
||||||
<li>Endianness fixes for the DRI swrast driver (bug 22767).</li>
|
<li>Endianness fixes for the DRI swrast driver (bug 22767).</li>
|
||||||
<li>Point sprite fixes for i915/945 driver.
|
<li>Point sprite fixes for i915/945 driver.
|
||||||
<li>Fixed assorted memory leaks (usually on error paths)
|
<li>Fixed assorted memory leaks (usually on error paths)
|
||||||
|
<li>Fixed some GLSL compiler bugs (ex: 25579)
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<h2>Changes</h2>
|
<h2>Changes</h2>
|
||||||
|
|
|
@ -528,15 +528,11 @@ _mesa_remove_output_reads(struct gl_program *prog, gl_register_file type)
|
||||||
/* look for instructions which write to the varying vars identified above */
|
/* look for instructions which write to the varying vars identified above */
|
||||||
for (i = 0; i < prog->NumInstructions; i++) {
|
for (i = 0; i < prog->NumInstructions; i++) {
|
||||||
struct prog_instruction *inst = prog->Instructions + i;
|
struct prog_instruction *inst = prog->Instructions + i;
|
||||||
const GLuint numSrc = _mesa_num_inst_src_regs(inst->Opcode);
|
if (inst->DstReg.File == type &&
|
||||||
GLuint j;
|
outputMap[inst->DstReg.Index] >= 0) {
|
||||||
for (j = 0; j < numSrc; j++) {
|
/* change inst to write to the temp reg, instead of the varying */
|
||||||
if (inst->DstReg.File == type &&
|
inst->DstReg.File = PROGRAM_TEMPORARY;
|
||||||
outputMap[inst->DstReg.Index] >= 0) {
|
inst->DstReg.Index = outputMap[inst->DstReg.Index];
|
||||||
/* change inst to write to the temp reg, instead of the varying */
|
|
||||||
inst->DstReg.File = PROGRAM_TEMPORARY;
|
|
||||||
inst->DstReg.Index = outputMap[inst->DstReg.Index];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue