X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_texture.h;h=d8cd7c7b5c1f327237b60da637455a508231c04b;hb=6e3730452152ca74ad3b51bf1dd4b69b20dbc019;hp=c62f7f2cc0d172834e519f3bddee0a72c08e5c35;hpb=ee30e24f5f9cc2ec6c5a3edbe498e5e0334f788b;p=mesa.git diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index c62f7f2cc0d..d8cd7c7b5c1 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2007 VMware, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -18,7 +18,7 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -34,30 +34,43 @@ #include "main/mtypes.h" -struct pipe_context; -struct pipe_texture; +struct pipe_resource; + +struct st_texture_image_transfer { + struct pipe_transfer *transfer; + + /* For ETC fallback. */ + GLubyte *temp_data; /**< Temporary ETC texture storage. */ + unsigned temp_stride; /**< Stride of the ETC texture storage. */ + GLubyte *map; /**< Saved map pointer of the uncompressed transfer. */ +}; + + +/** + * Subclass of gl_texure_image. + */ struct st_texture_image { struct gl_texture_image base; - /* These aren't stored in gl_texture_image - */ - GLuint level; - GLuint face; - /* If stImage->pt != NULL, image data is stored here. - * Else if stImage->base.Data != NULL, image is stored there. * Else there is no image data. */ - struct pipe_texture *pt; + struct pipe_resource *pt; - struct pipe_transfer *transfer; + /* List of transfers, allocated on demand. + * transfer[layer] is a mapping for that layer. + */ + struct st_texture_image_transfer *transfer; + unsigned num_transfers; }; - +/** + * Subclass of gl_texure_object. + */ struct st_texture_object { struct gl_texture_object base; /* The "parent" object */ @@ -66,85 +79,101 @@ struct st_texture_object */ GLuint lastLevel; - /* On validation any active images held in main memory or in other - * textures will be copied to this texture and the old storage freed. + /** The size of the level=0 mipmap image. + * Note that the number of 1D array layers will be in height0 and the + * number of 2D array layers will be in depth0, as in GL. */ - struct pipe_texture *pt; + GLuint width0, height0, depth0; - /* Default sampler view attached to this texture object. Created lazily - * on first binding. + /* On validation any active images held in main memory or in other + * textures will be copied to this texture and the old storage freed. */ - struct pipe_sampler_view *sampler_view; + struct pipe_resource *pt; - struct pipe_context *pipe; + /* Number of views in sampler_views array */ + GLuint num_sampler_views; - GLboolean teximage_realloc; + /* Array of sampler views (one per context) attached to this texture + * object. Created lazily on first binding in context. + */ + struct pipe_sampler_view **sampler_views; - /* True if there is/was a surface bound to this texture object. It helps - * track whether the texture object is surface based or not. + /* True if this texture comes from the window system. Such a texture + * cannot be reallocated and the format can only be changed with a sampler + * view or a surface. */ GLboolean surface_based; + + /* If surface_based is true, this format should be used for all sampler + * views and surfaces instead of pt->format. + */ + enum pipe_format surface_format; }; -static INLINE struct st_texture_image * +static inline struct st_texture_image * st_texture_image(struct gl_texture_image *img) { return (struct st_texture_image *) img; } -static INLINE struct st_texture_object * +static inline const struct st_texture_image * +st_texture_image_const(const struct gl_texture_image *img) +{ + return (const struct st_texture_image *) img; +} + +static inline struct st_texture_object * st_texture_object(struct gl_texture_object *obj) { return (struct st_texture_object *) obj; } +static inline const struct st_texture_object * +st_texture_object_const(const struct gl_texture_object *obj) +{ + return (const struct st_texture_object *) obj; +} + -static INLINE struct pipe_texture * -st_get_texobj_texture(struct gl_texture_object *texObj) +static inline struct pipe_resource * +st_get_texobj_resource(struct gl_texture_object *texObj) { struct st_texture_object *stObj = st_texture_object(texObj); return stObj ? stObj->pt : NULL; } -static INLINE struct pipe_texture * -st_get_stobj_texture(struct st_texture_object *stObj) +static inline struct pipe_resource * +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_texture *texture) +static inline struct pipe_sampler_view * +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, - texture->format); + u_sampler_view_default_template(&templ, texture, format); return pipe->create_sampler_view(pipe, texture, &templ); } - -static INLINE struct pipe_sampler_view * -st_get_stobj_sampler_view(struct st_texture_object *stObj) +static inline struct pipe_sampler_view * +st_create_texture_sampler_view(struct pipe_context *pipe, + struct pipe_resource *texture) { - if (!stObj || !stObj->pt) { - return NULL; - } - - if (!stObj->sampler_view) { - stObj->sampler_view = st_sampler_view_from_texture(stObj->pipe, stObj->pt); - } - - return stObj->sampler_view; + return st_create_texture_sampler_view_format(pipe, texture, + texture->format); } -extern struct pipe_texture * + +extern struct pipe_resource * st_texture_create(struct st_context *st, enum pipe_texture_target target, enum pipe_format format, @@ -152,72 +181,74 @@ st_texture_create(struct st_context *st, GLuint width0, GLuint height0, GLuint depth0, + GLuint layers, + GLuint nr_samples, GLuint tex_usage ); +extern void +st_gl_texture_dims_to_pipe_dims(GLenum texture, + GLuint widthIn, + GLuint heightIn, + GLuint depthIn, + GLuint *widthOut, + GLuint *heightOut, + GLuint *depthOut, + GLuint *layersOut); + /* Check if an image fits into an existing texture object. */ extern GLboolean -st_texture_match_image(const struct pipe_texture *pt, - const struct gl_texture_image *image, - GLuint face, GLuint level); +st_texture_match_image(struct st_context *st, + const struct pipe_resource *pt, + const struct gl_texture_image *image); /* Return a pointer to an image within a texture. Return image stride as * well. */ extern GLubyte * -st_texture_image_map(struct st_context *st, - struct st_texture_image *stImage, - GLuint zoffset, +st_texture_image_map(struct st_context *st, struct st_texture_image *stImage, enum pipe_transfer_usage usage, - unsigned x, unsigned y, - unsigned w, unsigned h); + GLuint x, GLuint y, GLuint z, + GLuint w, GLuint h, GLuint d, + struct pipe_transfer **transfer); extern void st_texture_image_unmap(struct st_context *st, - struct st_texture_image *stImage); + struct st_texture_image *stImage, unsigned slice); /* Return pointers to each 2d slice within an image. Indexed by depth * value. */ extern const GLuint * -st_texture_depth_offsets(struct pipe_texture *pt, GLuint level); +st_texture_depth_offsets(struct pipe_resource *pt, GLuint level); - -/* Return the linear offset of an image relative to the start of its region. +/* Copy an image between two textures */ -extern GLuint -st_texture_image_offset(const struct pipe_texture *pt, - GLuint face, GLuint level); - -extern GLuint -st_texture_texel_offset(const struct pipe_texture * pt, - GLuint face, GLuint level, - GLuint col, GLuint row, GLuint img); +extern void +st_texture_image_copy(struct pipe_context *pipe, + struct pipe_resource *dst, GLuint dstLevel, + struct pipe_resource *src, GLuint srcLevel, + GLuint face); -/* Upload an image into a texture - */ -extern void -st_texture_image_data(struct st_context *st, - struct pipe_texture *dst, - GLuint face, GLuint level, void *src, - GLuint src_row_pitch, GLuint src_image_pitch); +extern struct pipe_resource * +st_create_color_map_texture(struct gl_context *ctx); +extern struct pipe_sampler_view ** +st_texture_get_sampler_view(struct st_context *st, + struct st_texture_object *stObj); -/* Copy an image between two textures - */ extern void -st_texture_image_copy(struct pipe_context *pipe, - struct pipe_texture *dst, GLuint dstLevel, - struct pipe_texture *src, - GLuint face); +st_texture_release_sampler_view(struct st_context *st, + struct st_texture_object *stObj); extern void -st_teximage_flush_before_map(struct st_context *st, - struct pipe_texture *pt, - unsigned int face, - unsigned int level, - enum pipe_transfer_usage usage); +st_texture_release_all_sampler_views(struct st_context *st, + struct st_texture_object *stObj); + +void +st_texture_free_sampler_views(struct st_texture_object *stObj); + #endif