diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-15 11:32:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-15 11:32:48 +0200 |
| commit | 3fbadc13acf6beb4a2497970367e2c2c1b6039ca (patch) | |
| tree | 44bc51faf9ba2bf08022a268f1a85c55fc4431ca /mesalib/src/mesa/program/program.c | |
| parent | 4b424e0ba999b47ca62298e8104f76f940aac4d8 (diff) | |
| parent | 2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (diff) | |
| download | vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.gz vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.bz2 vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/configure.ac
mesalib/configs/linux-dri
mesalib/docs/download.html
mesalib/src/SConscript
mesalib/src/mesa/main/bufferobj.c
mesalib/src/mesa/main/bufferobj.h
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/renderbuffer.h
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/program/program.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/dix/window.c
xorg-server/xkb/xkb.c
xorg-server/xkb/xkmread.c
Diffstat (limited to 'mesalib/src/mesa/program/program.c')
| -rw-r--r-- | mesalib/src/mesa/program/program.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c index c39f85e89..2393a6386 100644 --- a/mesalib/src/mesa/program/program.c +++ b/mesalib/src/mesa/program/program.c @@ -421,12 +421,15 @@ _mesa_lookup_program(struct gl_context *ctx, GLuint id) /**
* Reference counting for vertex/fragment programs
+ * This is normally only called from the _mesa_reference_program() macro
+ * when there's a real pointer change.
*/
void
-_mesa_reference_program(struct gl_context *ctx,
- struct gl_program **ptr,
- struct gl_program *prog)
+_mesa_reference_program_(struct gl_context *ctx,
+ struct gl_program **ptr,
+ struct gl_program *prog)
{
+#ifndef NDEBUG
assert(ptr);
if (*ptr && prog) {
/* sanity check */
@@ -438,9 +441,8 @@ _mesa_reference_program(struct gl_context *ctx, else if ((*ptr)->Target == MESA_GEOMETRY_PROGRAM)
ASSERT(prog->Target == MESA_GEOMETRY_PROGRAM);
}
- if (*ptr == prog) {
- return; /* no change */
- }
+#endif
+
if (*ptr) {
GLboolean deleteFlag;
|