This looks good to me. However, I think we'll need to do the same thing
for LowerTESPatchVerticesIn and they can probably be handled by the same
pass.
On Mon, Jan 8, 2018 at 5:13 AM, Iago Toral Quiroga <ito...@igalia.com>
wrote:
> Intel was the only user, now it does this in NIR.
> ---
> src/compiler/glsl/builtin_variables.cpp | 13 +------------
> src/mesa/drivers/dri/i965/brw_context.c | 1 -
> src/mesa/main/mtypes.h | 1 -
> 3 files changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/src/compiler/glsl/builtin_variables.cpp
> b/src/compiler/glsl/builtin_variables.cpp
> index a885f32875..a686cb6a45 100644
> --- a/src/compiler/glsl/builtin_variables.cpp
> +++ b/src/compiler/glsl/builtin_variables.cpp
> @@ -38,11 +38,6 @@ static const struct gl_builtin_uniform_element
> gl_NumSamples_elements[] = {
> {NULL, {STATE_NUM_SAMPLES, 0, 0}, SWIZZLE_XXXX}
> };
>
> -/* only for TCS */
> -static const struct gl_builtin_uniform_element
> gl_PatchVerticesIn_elements[] = {
> - {NULL, {STATE_INTERNAL, STATE_TCS_PATCH_VERTICES_IN}, SWIZZLE_XXXX}
> -};
> -
> static const struct gl_builtin_uniform_element gl_DepthRange_elements[] =
> {
> {"near", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_XXXX},
> {"far", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_YYYY},
> @@ -240,7 +235,6 @@ static const struct gl_builtin_uniform_element
> gl_NormalMatrix_elements[] = {
> #define STATEVAR(name) {#name, name ## _elements, ARRAY_SIZE(name ##
> _elements)}
>
> static const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[]
> = {
> - STATEVAR(gl_PatchVerticesIn),
> STATEVAR(gl_NumSamples),
> STATEVAR(gl_DepthRange),
> STATEVAR(gl_ClipPlane),
> @@ -1067,12 +1061,7 @@ builtin_variable_generator::
> generate_tcs_special_vars()
> {
> add_system_value(SYSTEM_VALUE_PRIMITIVE_ID, int_t, "gl_PrimitiveID");
> add_system_value(SYSTEM_VALUE_INVOCATION_ID, int_t,
> "gl_InvocationID");
> -
> - if (state->ctx->Const.LowerTCSPatchVerticesIn) {
> - add_uniform(int_t, "gl_PatchVerticesIn");
> - } else {
> - add_system_value(SYSTEM_VALUE_VERTICES_IN, int_t,
> "gl_PatchVerticesIn");
> - }
> + add_system_value(SYSTEM_VALUE_VERTICES_IN, int_t,
> "gl_PatchVerticesIn");
>
> add_output(VARYING_SLOT_TESS_LEVEL_OUTER, array(float_t, 4),
> "gl_TessLevelOuter")->data.patch = 1;
> diff --git a/src/mesa/drivers/dri/i965/brw_context.c
> b/src/mesa/drivers/dri/i965/brw_context.c
> index b555f7bfdf..e44c2b1f34 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.c
> +++ b/src/mesa/drivers/dri/i965/brw_context.c
> @@ -537,7 +537,6 @@ brw_initialize_context_constants(struct brw_context
> *brw)
> ctx->Const.MaxClipPlanes = 8;
>
> ctx->Const.GLSLTessLevelsAsInputs = true;
> - ctx->Const.LowerTCSPatchVerticesIn = devinfo->gen >= 8;
> ctx->Const.LowerTESPatchVerticesIn = true;
> ctx->Const.PrimitiveRestartForPatches = true;
>
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index a4f1e78f41..fce456b2b4 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -4020,7 +4020,6 @@ struct gl_constants
> GLuint MaxTessPatchComponents;
> GLuint MaxTessControlTotalOutputComponents;
> bool LowerTessLevel; /**< Lower gl_TessLevel* from float[n] to vecn? */
> - bool LowerTCSPatchVerticesIn; /**< Lower gl_PatchVerticesIn to a
> uniform */
> bool LowerTESPatchVerticesIn; /**< Lower gl_PatchVerticesIn to a
> uniform */
> bool PrimitiveRestartForPatches;
> bool LowerCsDerivedVariables; /**< Lower gl_GlobalInvocationID and
> --
> 2.11.0
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
