diff options
| author | Bryan Cain <bryancain3@gmail.com> | 2013-02-15 08:53:20 -0600 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-08-01 20:20:36 -0700 |
| commit | ff523771833cf2cfb6d69d61e86a28c26b8400be (patch) | |
| tree | 8c5bbbcfa2552eed7a4d74ff34f174c623453d0d /src/glsl/builtin_variables.cpp | |
| parent | ae6eba3e32a142665d2ae6e15c9122d3201c0b5d (diff) | |
| download | external_mesa3d-ff523771833cf2cfb6d69d61e86a28c26b8400be.zip external_mesa3d-ff523771833cf2cfb6d69d61e86a28c26b8400be.tar.gz external_mesa3d-ff523771833cf2cfb6d69d61e86a28c26b8400be.tar.bz2 | |
glsl: add builtins for geometry shaders.
v2 (Paul Berry <stereotype441@gmail.com>): Account for rework of
builtin_variables.cpp. Use INTERP_QUALIFIER_FLAT for gl_PrimitiveID
so that it will obey provoking vertex conventions. Convert to GLSL
1.50 style geometry shaders.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
v3 (Paul Berry <stereotype441@gmail.com>): Be less obscure about
setting interpolation field of gl_Primitive variables.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl/builtin_variables.cpp')
| -rw-r--r-- | src/glsl/builtin_variables.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index 1e88b6a..6a808c0 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl/builtin_variables.cpp @@ -686,8 +686,11 @@ builtin_variable_generator::generate_gs_special_vars() * the specific case of gl_PrimitiveIDIn. So we don't need to treat * gl_PrimitiveIDIn as an {ARB,EXT}_geometry_shader4-only variable. */ - add_input(VARYING_SLOT_PRIMITIVE_ID, int_t, "gl_PrimitiveIDIn"); - add_output(VARYING_SLOT_PRIMITIVE_ID, int_t, "gl_PrimitiveID"); + ir_variable *var; + var = add_input(VARYING_SLOT_PRIMITIVE_ID, int_t, "gl_PrimitiveIDIn"); + var->interpolation = INTERP_QUALIFIER_FLAT; + var = add_output(VARYING_SLOT_PRIMITIVE_ID, int_t, "gl_PrimitiveID"); + var->interpolation = INTERP_QUALIFIER_FLAT; } @@ -702,6 +705,12 @@ builtin_variable_generator::generate_fs_special_vars() if (state->is_version(120, 100)) add_input(VARYING_SLOT_PNTC, vec2_t, "gl_PointCoord"); + if (state->is_version(150, 0)) { + ir_variable *var = + add_input(VARYING_SLOT_PRIMITIVE_ID, int_t, "gl_PrimitiveID"); + var->interpolation = INTERP_QUALIFIER_FLAT; + } + /* gl_FragColor and gl_FragData were deprecated starting in desktop GLSL * 1.30, and were relegated to the compatibility profile in GLSL 4.20. * They were removed from GLSL ES 3.00. |