mesa: Group gl_system_value values by the stage where they exist

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Ian Romanick 2014-06-18 15:48:36 -07:00 committed by Kenneth Graunke
parent 5d7275c350
commit 4837b130a7
2 changed files with 35 additions and 9 deletions

View file

@ -2051,13 +2051,31 @@ typedef enum
*/
typedef enum
{
SYSTEM_VALUE_FRONT_FACE, /**< Fragment shader only (not done yet) */
SYSTEM_VALUE_VERTEX_ID, /**< Vertex shader only */
SYSTEM_VALUE_INSTANCE_ID, /**< Vertex shader only */
SYSTEM_VALUE_SAMPLE_ID, /**< Fragment shader only */
SYSTEM_VALUE_SAMPLE_POS, /**< Fragment shader only */
SYSTEM_VALUE_SAMPLE_MASK_IN, /**< Fragment shader only */
SYSTEM_VALUE_INVOCATION_ID, /**< Geometry shader only */
/**
* \name Vertex shader system values
*/
/*@{*/
SYSTEM_VALUE_VERTEX_ID,
SYSTEM_VALUE_INSTANCE_ID,
/*@}*/
/**
* \name Geometry shader system values
*/
/*@{*/
SYSTEM_VALUE_INVOCATION_ID,
/*@}*/
/**
* \name Fragment shader system values
*/
/*@{*/
SYSTEM_VALUE_FRONT_FACE, /**< (not done yet) */
SYSTEM_VALUE_SAMPLE_ID,
SYSTEM_VALUE_SAMPLE_POS,
SYSTEM_VALUE_SAMPLE_MASK_IN,
/*@}*/
SYSTEM_VALUE_MAX /**< Number of values */
} gl_system_value;

View file

@ -4239,13 +4239,21 @@ struct st_translate {
/** Map Mesa's SYSTEM_VALUE_x to TGSI_SEMANTIC_x */
const unsigned _mesa_sysval_to_semantic[SYSTEM_VALUE_MAX] = {
TGSI_SEMANTIC_FACE,
/* Vertex shader
*/
TGSI_SEMANTIC_VERTEXID,
TGSI_SEMANTIC_INSTANCEID,
/* Geometry shader
*/
TGSI_SEMANTIC_INVOCATIONID,
/* Fragment shader
*/
TGSI_SEMANTIC_FACE,
TGSI_SEMANTIC_SAMPLEID,
TGSI_SEMANTIC_SAMPLEPOS,
TGSI_SEMANTIC_SAMPLEMASK,
TGSI_SEMANTIC_INVOCATIONID,
};
/**