i965: Directly call intel_batchbuffer_flush() after i915 split.

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_texture.h

diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.h b/src/mesa/drivers/dri/radeon/radeon_texture.h
index 8f9f5bd128e4348b4d4c2363c1c7a6292d001806..6ef640c3e203d2e365f09c2d6158e1e22963cb68 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_texture.h
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.h
@@ -32,7 +32,6 @@
 #define RADEON_TEXTURE_H
 
 #include "main/formats.h"
-#include "main/mfeatures.h"
 
 extern gl_format _radeon_texformat_rgba8888;
 extern gl_format _radeon_texformat_argb8888;
@@ -47,15 +46,13 @@ void copy_rows(void* dst, GLuint dststride, const void* src, GLuint srcstride,
 struct gl_texture_image *radeonNewTextureImage(struct gl_context *ctx);
 void radeonFreeTextureImageBuffer(struct gl_context *ctx, struct gl_texture_image *timage);
 
-void radeon_teximage_map(radeon_texture_image *image, GLboolean write_enable);
-void radeon_teximage_unmap(radeon_texture_image *image);
-int radeon_validate_texture_miptree(struct gl_context * ctx, struct gl_texture_object *texObj);
+int radeon_validate_texture_miptree(struct gl_context * ctx,
+                                   struct gl_sampler_object *samp,
+                                   struct gl_texture_object *texObj);
 
 
-void radeon_swrast_map_texture_images(struct gl_context *ctx, struct gl_texture_object *texObj);
-void radeon_swrast_unmap_texture_images(struct gl_context *ctx, struct gl_texture_object *texObj);
-
 gl_format radeonChooseTextureFormat_mesa(struct gl_context * ctx,
+                                         GLenum target,
                                          GLint internalFormat,
                                          GLenum format,
                                          GLenum type);
@@ -74,12 +71,10 @@ void radeonCopyTexSubImage(struct gl_context *ctx, GLuint dims,
 
 unsigned radeonIsFormatRenderable(gl_format mesa_format);
 
-#if FEATURE_OES_EGL_image
 void radeon_image_target_texture_2d(struct gl_context *ctx, GLenum target,
                                    struct gl_texture_object *texObj,
                                    struct gl_texture_image *texImage,
                                    GLeglImageOES image_handle);
-#endif
 
 void
 radeon_init_common_texture_funcs(radeonContextPtr radeon,