diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-12 20:32:41 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-12 20:32:41 -0600 |
| commit | f3b215cba2bca92d6582cc0c34702b73289f909c (patch) | |
| tree | b7a534f0adae00b68641b005c0db81227cf5aa8e /src/mesa/shader/slang/slang_builtin.c | |
| parent | fdfb0d4b0e04bff2f3dbae2d1f8e3765fb4b0dce (diff) | |
| parent | f7618f4f37d42461b1a6feaa392935d1ae703873 (diff) | |
Merge branch 'new-frag-attribs'
This branch introduces new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment
program inputs for GLSL gl_FrontFacing and gl_PointCoord. Before, these
attributes were packed with the FOG attribute. That made things
complicated elsewhere.
Diffstat (limited to 'src/mesa/shader/slang/slang_builtin.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_builtin.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_builtin.c b/src/mesa/shader/slang/slang_builtin.c index 5721e9b8f1..9ed8e3ecb3 100644 --- a/src/mesa/shader/slang/slang_builtin.c +++ b/src/mesa/shader/slang/slang_builtin.c @@ -752,8 +752,9 @@ static const struct input_info fragInputs[] = { { "gl_TexCoord", FRAG_ATTRIB_TEX0, GL_FLOAT_VEC4, SWIZZLE_NOOP }, /* note: we're packing several quantities into the fogcoord vector */ { "gl_FogFragCoord", FRAG_ATTRIB_FOGC, GL_FLOAT, SWIZZLE_XXXX }, - { "gl_FrontFacing", FRAG_ATTRIB_FOGC, GL_BOOL, SWIZZLE_YYYY }, /*XXX*/ - { "gl_PointCoord", FRAG_ATTRIB_FOGC, GL_FLOAT_VEC2, SWIZZLE_ZWWW }, + { "gl_FogFragCoord", FRAG_ATTRIB_FOGC, GL_FLOAT, SWIZZLE_XXXX }, + { "gl_FrontFacing", FRAG_ATTRIB_FACE, GL_FLOAT, SWIZZLE_XXXX }, + { "gl_PointCoord", FRAG_ATTRIB_PNTC, GL_FLOAT_VEC2, SWIZZLE_XYZW }, { NULL, 0, SWIZZLE_NOOP } }; |