summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2016-05-30 11:50:07 -0400
committerIlia Mirkin <[email protected]>2016-08-30 20:25:15 -0400
commit891d7e3c9eb71ba42a7aea20dc45bdb3d624fc82 (patch)
tree9dc459a006ffdbee45e8ad0bb761649d2e028c8e /src/mesa
parent10663c648e58762eb39c7670c9397b74521e8134 (diff)
glsl: add gl_BoundingBox and associated varying slots
Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/mtypes.h5
-rw-r--r--src/mesa/program/prog_print.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d2bc0b5fa90..df934469d05 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -110,6 +110,8 @@ _mesa_varying_slot_in_fs(gl_varying_slot slot)
case VARYING_SLOT_LAYER:
case VARYING_SLOT_TESS_LEVEL_OUTER:
case VARYING_SLOT_TESS_LEVEL_INNER:
+ case VARYING_SLOT_BOUNDING_BOX0:
+ case VARYING_SLOT_BOUNDING_BOX1:
return GL_FALSE;
default:
return GL_TRUE;
@@ -3789,6 +3791,9 @@ struct gl_constants
bool LowerCsDerivedVariables; /**< Lower gl_GlobalInvocationID and
* gl_LocalInvocationIndex based on
* other builtin variables. */
+
+ /** GL_OES_primitive_bounding_box */
+ bool NoPrimitiveBoundingBoxOutput;
};
diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c
index b8d7cca2f3b..7a7d2745460 100644
--- a/src/mesa/program/prog_print.c
+++ b/src/mesa/program/prog_print.c
@@ -151,6 +151,8 @@ arb_input_attrib_string(GLuint index, GLenum progType)
"fragment.(twenty-five)", /* VARYING_SLOT_TESS_LEVEL_INNER */
"fragment.(twenty-six)", /* VARYING_SLOT_CULL_DIST0 */
"fragment.(twenty-seven)", /* VARYING_SLOT_CULL_DIST1 */
+ "fragment.(twenty-eight)", /* VARYING_SLOT_BOUNDING_BOX0 */
+ "fragment.(twenty-nine)", /* VARYING_SLOT_BOUNDING_BOX1 */
"fragment.varying[0]",
"fragment.varying[1]",
"fragment.varying[2]",
@@ -280,6 +282,8 @@ arb_output_attrib_string(GLuint index, GLenum progType)
"result.(twenty-five)", /* VARYING_SLOT_TESS_LEVEL_INNER */
"result.(twenty-six)", /* VARYING_SLOT_CULL_DIST0 */
"result.(twenty-seven)", /* VARYING_SLOT_CULL_DIST1 */
+ "result.(twenty-eight)", /* VARYING_SLOT_BOUNDING_BOX0 */
+ "result.(twenty-nine)", /* VARYING_SLOT_BOUNDING_BOX1 */
"result.varying[0]",
"result.varying[1]",
"result.varying[2]",