rename st_cb_teximage.h st_format.h

diff --git a/src/mesa/sources b/src/mesa/sources
index 9bcb07c..be81e10 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -196,11 +196,11 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_drawpixels.c \
        state_tracker/st_cb_fbo.c \
        state_tracker/st_cb_program.c \
-       state_tracker/st_cb_teximage.c \
        state_tracker/st_cb_texture.c \
        state_tracker/st_cb_bufferobjects.c \
-       state_tracker/st_draw.c \
        state_tracker/st_context.c \
+       state_tracker/st_draw.c \
+       state_tracker/st_format.c \
        state_tracker/st_mipmap_tree.c
 
 SHADER_SOURCES = \

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 6b7cef2..20990fe 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -38,7 +38,7 @@
 #include "st_program.h"
 #include "st_cb_drawpixels.h"
 #include "st_cb_texture.h"
-#include "st_cb_teximage.h"
+#include "st_format.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/tgsi/mesa/mesa_to_tgsi.h"

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 8443c9e..bee7474 100644 (file)
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -43,7 +43,7 @@
 #include "pipe/p_defines.h"
 #include "st_context.h"
 #include "st_cb_fbo.h"
-#include "st_cb_teximage.h"
+#include "st_format.h"
 
 
 

diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 6850d60..22c1b4b 100644 (file)
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -38,7 +38,7 @@
 
 #include "state_tracker/st_context.h"
 #include "state_tracker/st_cb_texture.h"
-#include "state_tracker/st_cb_teximage.h"
+#include "state_tracker/st_format.h"
 #include "state_tracker/st_mipmap_tree.h"
 
 #include "pipe/p_context.h"

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index c54602d..4f36c84 100644 (file)
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -40,7 +40,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "st_context.h"
-#include "st_cb_teximage.h"
+#include "st_format.h"