aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-02 08:47:42 +0200
committermarha <marha@users.sourceforge.net>2012-07-02 08:47:42 +0200
commitfdef5bff99e6079f64bc6b91c91b42195c85adeb (patch)
tree5d9c311d9f36cfa26850d02801388953ccc17b54 /mesalib/src/mesa
parentf6d1847eef027266daa0f75ee92ceb09698b2761 (diff)
downloadvcxsrv-fdef5bff99e6079f64bc6b91c91b42195c85adeb.tar.gz
vcxsrv-fdef5bff99e6079f64bc6b91c91b42195c85adeb.tar.bz2
vcxsrv-fdef5bff99e6079f64bc6b91c91b42195c85adeb.zip
mesa pixman xserver git update 2 Jul 2012
Diffstat (limited to 'mesalib/src/mesa')
-rw-r--r--mesalib/src/mesa/main/mtypes.h6
-rw-r--r--mesalib/src/mesa/state_tracker/st_cb_fbo.c10
2 files changed, 3 insertions, 13 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 5768ed7cd..bdbb5137e 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -3200,12 +3200,6 @@ struct gl_dlist_state
GLubyte ActiveMaterialSize[MAT_ATTRIB_MAX];
GLfloat CurrentMaterial[MAT_ATTRIB_MAX][4];
- GLubyte ActiveIndex;
- GLfloat CurrentIndex;
-
- GLubyte ActiveEdgeFlag;
- GLboolean CurrentEdgeFlag;
-
struct {
/* State known to have been set by the currently-compiling display
* list. Used to eliminate some redundant state changes.
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index 10f4e09cf..e1818abb9 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -57,10 +57,6 @@
#include "util/u_surface.h"
-/** Set to 1 to enable extra debug code */
-#define ST_DEBUG_FBO 0
-
-
static GLboolean
st_renderbuffer_alloc_sw_storage(struct gl_context * ctx,
struct gl_renderbuffer *rb,
@@ -480,9 +476,9 @@ st_finish_render_texture(struct gl_context *ctx,
static void
st_fbo_invalid(const char *reason)
{
-#if ST_DEBUG_FBO
- debug_printf("Invalid FBO: %s\n", reason);
-#endif
+ if (MESA_DEBUG_FLAGS & DEBUG_INCOMPLETE_FBO) {
+ _mesa_debug(NULL, "Invalid FBO: %s\n", reason);
+ }
}