i956: Fix the old FP path fragment position setup on gen6.

[mesa.git] / src / mesa / state_tracker / st_texture.h

diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index 12ef2d7d01c3f11e44972cc65716edf28ce5f1b5..c78901c0360d25c485649ee4821e0b8a16ca9541 100644 (file)
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -34,10 +34,13 @@
 
 #include "main/mtypes.h"
 
-struct pipe_context;
+
 struct pipe_resource;
 
 
+/**
+ * Subclass of gl_texure_image.
+ */
 struct st_texture_image
 {
    struct gl_texture_image base;
@@ -57,7 +60,9 @@ struct st_texture_image
 };
 
 
-
+/**
+ * Subclass of gl_texure_object.
+ */
 struct st_texture_object
 {
    struct gl_texture_object base;       /* The "parent" object */
@@ -66,6 +71,9 @@ struct st_texture_object
     */
    GLuint lastLevel;
 
+   /** The size of the level=0 mipmap image */
+   GLuint width0, height0, depth0;
+
    /* On validation any active images held in main memory or in other
     * textures will be copied to this texture and the old storage freed.
     */
@@ -76,10 +84,6 @@ struct st_texture_object
     */
    struct pipe_sampler_view *sampler_view;
 
-   struct pipe_context *pipe;
-
-   GLboolean teximage_realloc;
-
    /* True if there is/was a surface bound to this texture object.  It helps
     * track whether the texture object is surface based or not.
     */
@@ -101,7 +105,7 @@ st_texture_object(struct gl_texture_object *obj)
 
 
 static INLINE struct pipe_resource *
-st_get_texobj_texture(struct gl_texture_object *texObj)
+st_get_texobj_resource(struct gl_texture_object *texObj)
 {
    struct st_texture_object *stObj = st_texture_object(texObj);
    return stObj ? stObj->pt : NULL;
@@ -109,15 +113,15 @@ st_get_texobj_texture(struct gl_texture_object *texObj)
 
 
 static INLINE struct pipe_resource *
-st_get_stobj_texture(struct st_texture_object *stObj)
+st_get_stobj_resource(struct st_texture_object *stObj)
 {
    return stObj ? stObj->pt : NULL;
 }
 
 
 static INLINE struct pipe_sampler_view *
-st_sampler_view_from_texture(struct pipe_context *pipe,
-                             struct pipe_resource *texture)
+st_create_texture_sampler_view(struct pipe_context *pipe,
+                               struct pipe_resource *texture)
 {
    struct pipe_sampler_view templ;
 
@@ -130,14 +134,30 @@ st_sampler_view_from_texture(struct pipe_context *pipe,
 
 
 static INLINE struct pipe_sampler_view *
-st_get_texture_sampler_view(struct st_texture_object *stObj)
+st_create_texture_sampler_view_format(struct pipe_context *pipe,
+                                      struct pipe_resource *texture,
+                                      enum pipe_format format)
+{
+   struct pipe_sampler_view templ;
+
+   u_sampler_view_default_template(&templ,
+                                   texture,
+                                   format);
+
+   return pipe->create_sampler_view(pipe, texture, &templ);
+}
+
+static INLINE struct pipe_sampler_view *
+st_get_texture_sampler_view(struct st_texture_object *stObj,
+                            struct pipe_context *pipe)
+
 {
    if (!stObj || !stObj->pt) {
       return NULL;
    }
 
    if (!stObj->sampler_view) {
-      stObj->sampler_view = st_sampler_view_from_texture(stObj->pipe, stObj->pt);
+      stObj->sampler_view = st_create_texture_sampler_view(pipe, stObj->pt);
    }
 
    return stObj->sampler_view;
@@ -185,18 +205,6 @@ extern const GLuint *
 st_texture_depth_offsets(struct pipe_resource *pt, GLuint level);
 
 
-/* Return the linear offset of an image relative to the start of its region.
- */
-extern GLuint
-st_texture_image_offset(const struct pipe_resource *pt,
-                        GLuint face, GLuint level);
-
-extern GLuint
-st_texture_texel_offset(const struct pipe_resource * pt,
-                        GLuint face, GLuint level,
-                        GLuint col, GLuint row, GLuint img);
-
-
 /* Upload an image into a texture
  */
 extern void
@@ -211,13 +219,7 @@ st_texture_image_data(struct st_context *st,
 extern void
 st_texture_image_copy(struct pipe_context *pipe,
                       struct pipe_resource *dst, GLuint dstLevel,
-                      struct pipe_resource *src,
+                      struct pipe_resource *src, GLuint srcLevel,
                       GLuint face);
 
-extern void
-st_teximage_flush_before_map(struct st_context *st,
-                            struct pipe_resource *pt,
-                            unsigned int face,
-                            unsigned int level,
-                            enum pipe_transfer_usage usage);
 #endif