fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 15:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

i965: Fix the passthrough TCS for isolines.

Browse source 
We weren't setting up several of the uniform values for the patch
header, so we'd crash when uploading push constants.  We at least
need to initialize them to zero.  We also had the isoline parameters
reversed, so it would also render incorrectly (if it didn't crash).

Fixes a new Piglit test(*) (isoline-no-tcs), as well as crashes in
GL44-CTS.tessellation_shader.single.max_patch_vertices.

(*) https://lists.freedesktop.org/archives/piglit/2016-May/019866.html

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Cc: mesa-stable@lists.freedesktop.org
This commit is contained in:
Kenneth Graunke 2016-05-26 00:29:56 -07:00
parent ebb81cd683
commit a3dc99f3d4
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/drivers/dri/i965/brw_tcs.c
View file

@ -225,19 +225,24 @@ brw_codegen_tcs_prog(struct brw_context *brw,
*/
const float **param = (const float **) prog_data.base.base.param;
static float zero = 0.0f;
for (int i = 0; i < 4; i++) {
param[7 - i] = &ctx->TessCtrlProgram.patch_default_outer_level[i];
}
for (int i = 0; i < 8; i++)
param[i] = &zero;
if (key->tes_primitive_mode == GL_QUADS) {
for (int i = 0; i < 4; i++)
param[7 - i] = &ctx->TessCtrlProgram.patch_default_outer_level[i];
param[3] = &ctx->TessCtrlProgram.patch_default_inner_level[0];
param[2] = &ctx->TessCtrlProgram.patch_default_inner_level[1];
param[1] = &zero;
param[0] = &zero;
} else if (key->tes_primitive_mode == GL_TRIANGLES) {
for (int i = 0; i < 3; i++)
param[7 - i] = &ctx->TessCtrlProgram.patch_default_outer_level[i];
param[4] = &ctx->TessCtrlProgram.patch_default_inner_level[0];
for (int i = 0; i < 4; i++)
param[i] = &zero;
} else {
assert(key->tes_primitive_mode == GL_ISOLINES);
param[7] = &ctx->TessCtrlProgram.patch_default_outer_level[1];
param[6] = &ctx->TessCtrlProgram.patch_default_outer_level[0];
}
}