diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-04 13:38:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-04 13:38:47 +0200 |
| commit | 2ecad38adbeaa652daaab8f2a6d112921b7e74eb (patch) | |
| tree | adce02d84ceeb4be5fef88a1ba490b1294685a5b /mesalib/src/mesa/program | |
| parent | 28d1f604563d9c738a4c5630364d0e6b4e9b13ff (diff) | |
| download | vcxsrv-2ecad38adbeaa652daaab8f2a6d112921b7e74eb.tar.gz vcxsrv-2ecad38adbeaa652daaab8f2a6d112921b7e74eb.tar.bz2 vcxsrv-2ecad38adbeaa652daaab8f2a6d112921b7e74eb.zip | |
fontconfig mesa libxcb git update 4 jul 2013
libxcb commit 8b6bb1a71977116d382f45eef803aedd3e313d37
libxcb/xcb-proto commit e6a246e50e62cbcba33d0e1d2371e69e6e089383
fontconfig commit d420e1df983871ab18b0f07976596fdf0ce78847
mesa commit bbd1e60198548a12be3405fc32dd39a87e8968ab
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/ir_to_mesa.cpp | 10 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/program.h | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp index 35a9b8437..4af1c8241 100644 --- a/mesalib/src/mesa/program/ir_to_mesa.cpp +++ b/mesalib/src/mesa/program/ir_to_mesa.cpp @@ -3073,12 +3073,6 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) linked_prog = get_mesa_program(ctx, prog, prog->_LinkedShaders[i]); if (linked_prog) { - static const GLenum targets[] = { - GL_VERTEX_PROGRAM_ARB, - GL_FRAGMENT_PROGRAM_ARB, - GL_GEOMETRY_PROGRAM_NV - }; - if (i == MESA_SHADER_VERTEX) { ((struct gl_vertex_program *)linked_prog)->UsesClipDistance = prog->Vert.UsesClipDistance; @@ -3086,7 +3080,9 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) _mesa_reference_program(ctx, &prog->_LinkedShaders[i]->Program, linked_prog); - if (!ctx->Driver.ProgramStringNotify(ctx, targets[i], linked_prog)) { + if (!ctx->Driver.ProgramStringNotify(ctx, + _mesa_program_index_to_target(i), + linked_prog)) { return GL_FALSE; } } diff --git a/mesalib/src/mesa/program/program.h b/mesalib/src/mesa/program/program.h index ecda59b58..f28983894 100644 --- a/mesalib/src/mesa/program/program.h +++ b/mesalib/src/mesa/program/program.h @@ -205,8 +205,8 @@ _mesa_program_index_to_target(GLuint i) { static const GLenum enums[MESA_SHADER_TYPES] = { GL_VERTEX_PROGRAM_ARB, - GL_FRAGMENT_PROGRAM_ARB, GL_GEOMETRY_PROGRAM_NV, + GL_FRAGMENT_PROGRAM_ARB }; if(i >= MESA_SHADER_TYPES) return 0; |