summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/state.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2008-09-21 19:29:15 -0700
committerKeith Whitwell <[email protected]>2008-09-21 22:13:52 -0700
commit34a61c66fd1b625a5606b795d192a49632ff1787 (patch)
tree6c185413739b4af3b9790df17dc53a76a32f2312 /src/mesa/main/state.c
parent24172fe595eede2649dd88363d2cda68f928a03e (diff)
mesa: refactor: move #define FEATURE flags into new mfeatures.h file
Also, check the FEATURE flags in many places. (cherry picked from commit 40d1a40f294f1ed2dacfad6f5498322fc08cc2d1) Conflicts: src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c
Diffstat (limited to 'src/mesa/main/state.c')
-rw-r--r--src/mesa/main/state.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index cf88fcd405b..d233201b0ba 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -40,7 +40,9 @@
#include "framebuffer.h"
#include "light.h"
#include "matrix.h"
+#if FEATURE_pixel_transfer
#include "pixel.h"
+#endif
#include "shader/program.h"
#include "state.h"
#include "stencil.h"
@@ -469,8 +471,10 @@ _mesa_update_state_locked( GLcontext *ctx )
if (new_state & _NEW_STENCIL)
_mesa_update_stencil( ctx );
+#if FEATURE_pixel_transfer
if (new_state & _IMAGE_NEW_TRANSFER_STATE)
_mesa_update_pixel( ctx, new_state );
+#endif
if (new_state & _DD_NEW_SEPARATE_SPECULAR)
update_separate_specular( ctx );