diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-03-22 12:01:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-03-22 12:01:21 +1000 |
| commit | 2d26d4ac66e8c3e48b73d3e172d0e0d2a2ad31a5 (patch) | |
| tree | 6b0d899db605b28e10b9b953d181b09bf40bb472 /src/mesa/shader/prog_statevars.h | |
| parent | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (diff) | |
| parent | 699897e81c623e53be51fba0488f535b0a8d7761 (diff) | |
Merge remote branch 'origin/master' into HEAD
Diffstat (limited to 'src/mesa/shader/prog_statevars.h')
| -rw-r--r-- | src/mesa/shader/prog_statevars.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/shader/prog_statevars.h b/src/mesa/shader/prog_statevars.h index d563080db1..1180d9eaa4 100644 --- a/src/mesa/shader/prog_statevars.h +++ b/src/mesa/shader/prog_statevars.h @@ -117,6 +117,7 @@ typedef enum gl_state_index_ { STATE_PCM_SCALE, /**< Post color matrix RGBA scale */ STATE_PCM_BIAS, /**< Post color matrix RGBA bias */ STATE_SHADOW_AMBIENT, /**< ARB_shadow_ambient fail value; token[2] is texture unit index */ + STATE_FB_SIZE, /**< (width-1, height-1, 0, 0) */ STATE_ROT_MATRIX_0, /**< ATI_envmap_bumpmap, rot matrix row 0 */ STATE_ROT_MATRIX_1, /**< ATI_envmap_bumpmap, rot matrix row 1 */ STATE_INTERNAL_DRIVER /* first available state index for drivers (must be last) */ |