st/mesa/glsl/nir/i965: make use of new gl_shader_program_data in gl_shader_program

[mesa.git] / src / mesa / main / teximage.h

diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 8b687062a67948c5e9be739aa986fde5ccfe26ca..05fa00d231dafbce31a5e7f0f14ffa10e1be4eff 100644 (file)
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -176,9 +176,10 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target);
 
 
 extern GLboolean
-_mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-                          mesa_format format,
-                          GLint width, GLint height, GLint depth, GLint border);
+_mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target,
+                          GLuint numLevels, GLint level,
+                          mesa_format format, GLuint numSamples,
+                          GLint width, GLint height, GLint depth);
 
 extern GLboolean
 _mesa_target_can_be_compressed(const struct gl_context *ctx, GLenum target,
@@ -249,14 +250,6 @@ _mesa_copy_texture_sub_image(struct gl_context *ctx, GLuint dims,
                              GLsizei width, GLsizei height,
                              const char *caller);
 
-extern void
-_mesa_texture_buffer_range(struct gl_context *ctx,
-                           struct gl_texture_object *texObj,
-                           GLenum internalFormat,
-                           struct gl_buffer_object *bufObj,
-                           GLintptr offset, GLsizeiptr size,
-                           const char *caller);
-
 bool
 _mesa_is_cube_map_texture(GLenum target);