diff options
| author | Nicolai Hähnle <[email protected]> | 2009-10-03 19:30:48 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2009-10-03 19:30:48 +0200 |
| commit | 6d25b9125ec1e66e0e255b0ee20fe18dfe1076fa (patch) | |
| tree | c376951940eac2875567979a81e6a03a019942b7 /src/mesa/shader/slang/slang_builtin.c | |
| parent | 81c7561d9d3faf70ac22c6a5f3fbea18f53eed92 (diff) | |
| parent | 7d2699aedc084d9cb9c2bd2f8bdb5f038271ac1e (diff) | |
Merge branch 'master' into r300-compiler
Diffstat (limited to 'src/mesa/shader/slang/slang_builtin.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_builtin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_builtin.c b/src/mesa/shader/slang/slang_builtin.c index bef0f856534..e5809509c93 100644 --- a/src/mesa/shader/slang/slang_builtin.c +++ b/src/mesa/shader/slang/slang_builtin.c @@ -741,7 +741,7 @@ static const struct input_info vertInputs[] = { { "gl_MultiTexCoord5", VERT_ATTRIB_TEX5, GL_FLOAT_VEC4, SWIZZLE_NOOP }, { "gl_MultiTexCoord6", VERT_ATTRIB_TEX6, GL_FLOAT_VEC4, SWIZZLE_NOOP }, { "gl_MultiTexCoord7", VERT_ATTRIB_TEX7, GL_FLOAT_VEC4, SWIZZLE_NOOP }, - { NULL, 0, SWIZZLE_NOOP } + { NULL, 0, GL_NONE, SWIZZLE_NOOP } }; /** Predefined fragment shader inputs */ @@ -754,7 +754,7 @@ static const struct input_info fragInputs[] = { { "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 } + { NULL, 0, GL_NONE, SWIZZLE_NOOP } }; |