diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-12 09:07:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-12 09:07:21 +0200 |
| commit | 0b40f5f4b54453a77f4b09c431f8efc6875da61f (patch) | |
| tree | c1f08e0dd75a6ed7876c24c7219f93f01cab3605 /mesalib/src/mesa/main/nvprogram.c | |
| parent | 75530c6eb2feebe234f7cb078c4caaf70c64981a (diff) | |
| parent | 24a692ce832161d3b794110dd82b1508d38a0887 (diff) | |
| download | vcxsrv-0b40f5f4b54453a77f4b09c431f8efc6875da61f.tar.gz vcxsrv-0b40f5f4b54453a77f4b09c431f8efc6875da61f.tar.bz2 vcxsrv-0b40f5f4b54453a77f4b09c431f8efc6875da61f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/ast_to_hir.cpp
mesalib/src/glsl/glcpp/glcpp.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/common/spantmp2.h
mesalib/src/mesa/drivers/dri/common/utils.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
pixman/configure.ac
pixman/pixman/pixman-arm-neon-asm.S
pixman/test/Makefile.am
pixman/test/utils.c
pixman/test/utils.h
Diffstat (limited to 'mesalib/src/mesa/main/nvprogram.c')
| -rw-r--r-- | mesalib/src/mesa/main/nvprogram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/nvprogram.c b/mesalib/src/mesa/main/nvprogram.c index 7ff7645b7..a0e89b10f 100644 --- a/mesalib/src/mesa/main/nvprogram.c +++ b/mesalib/src/mesa/main/nvprogram.c @@ -560,7 +560,7 @@ _mesa_emit_nv_temp_initialization(struct gl_context *ctx, } void -_mesa_setup_nv_temporary_count(struct gl_context *ctx, struct gl_program *program) +_mesa_setup_nv_temporary_count(struct gl_program *program) { GLuint i; |