projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/st: refactor vertex and fragment shader translation
[mesa.git]
/
src
/
mesa
/
main
/
context.c
diff --git
a/src/mesa/main/context.c
b/src/mesa/main/context.c
index c57d7c10b62e0c48679e487b7f00e84196164a77..101d3c6b675dc02b65922209bc42f9ddb037ce92 100644
(file)
--- a/
src/mesa/main/context.c
+++ b/
src/mesa/main/context.c
@@
-123,7
+123,7
@@
#include "simple_list.h"
#include "state.h"
#include "stencil.h"
#include "simple_list.h"
#include "state.h"
#include "stencil.h"
-#include "texcompress.h"
+#include "texcompress
_s3tc
.h"
#include "teximage.h"
#include "texobj.h"
#include "texstate.h"
#include "teximage.h"
#include "texobj.h"
#include "texstate.h"
@@
-703,12
+703,7
@@
init_attrib_groups(GLcontext *ctx)
if (!_mesa_init_texture( ctx ))
return GL_FALSE;
if (!_mesa_init_texture( ctx ))
return GL_FALSE;
-#if FEATURE_texture_s3tc
_mesa_init_texture_s3tc( ctx );
_mesa_init_texture_s3tc( ctx );
-#endif
-#if FEATURE_texture_fxt1
- _mesa_init_texture_fxt1( ctx );
-#endif
/* Miscellaneous */
ctx->NewState = _NEW_ALL;
/* Miscellaneous */
ctx->NewState = _NEW_ALL;