[Mesa-dev] [PATCH 6/7] st/mesa: switch to using _mesa_readpixels()

[Brian Paul]

---
 src/mesa/state_tracker/st_cb_drawpixels.c |    1 -
 src/mesa/state_tracker/st_context.c       |    5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 95805fd..a5ed472 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -49,7 +49,6 @@
 #include "st_atom.h"
 #include "st_atom_constbuf.h"
 #include "st_cb_drawpixels.h"
-#include "st_cb_readpixels.h"
 #include "st_cb_fbo.h"
 #include "st_context.h"
 #include "st_debug.h"
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index a181772..a0c55e9 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -27,6 +27,7 @@
 
 #include "main/imports.h"
 #include "main/context.h"
+#include "main/readpix.h"
 #include "main/samplerobj.h"
 #include "main/shaderobj.h"
 #include "program/prog_cache.h"
@@ -48,7 +49,6 @@
 #include "st_cb_feedback.h"
 #include "st_cb_program.h"
 #include "st_cb_queryobj.h"
-#include "st_cb_readpixels.h"
 #include "st_cb_texture.h"
 #include "st_cb_xformfb.h"
 #include "st_cb_flush.h"
@@ -293,7 +293,6 @@ void st_init_driver_functions(struct dd_function_table *functions)
    st_init_program_functions(functions);
    st_init_query_functions(functions);
    st_init_cond_render_functions(functions);
-   st_init_readpixels_functions(functions);
    st_init_texture_functions(functions);
    st_init_texture_barrier_functions(functions);
    st_init_flush_functions(functions);
@@ -303,5 +302,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
    st_init_xformfb_functions(functions);
    st_init_syncobj_functions(functions);
 
+   functions->ReadPixels = _mesa_readpixels;
+
    functions->UpdateState = st_invalidate_state;
 }
-- 
1.7.3.4