projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: store state that affects sampler views per context
[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 cd6a73c7703941e7acd96e777b285fb35db46bf3..4f41aac53cfb4f575983aaa5e62bc379d6e3928b 100644
(file)
--- a/
src/mesa/state_tracker/st_texture.h
+++ b/
src/mesa/state_tracker/st_texture.h
@@
-48,6
+48,19
@@
struct st_texture_image_transfer {
};
};
+/**
+ * Container for one context's validated sampler view.
+ */
+struct st_sampler_view {
+ struct pipe_sampler_view *view;
+
+ /** The glsl version of the shader seen during validation */
+ bool glsl130_or_later;
+ /** The value of the sampler's sRGBDecode state during validation */
+ GLenum sRGBDecode;
+};
+
+
/**
* Subclass of gl_texure_image.
*/
/**
* Subclass of gl_texure_image.
*/
@@
-70,7
+83,7
@@
struct st_texture_image
* mapping/unmapping, as well as image copies.
*/
GLubyte *etc_data;
* mapping/unmapping, as well as image copies.
*/
GLubyte *etc_data;
-
};
+};
/**
/**
@@
-98,7
+111,7
@@
struct st_texture_object
/* Array of sampler views (one per context) attached to this texture
* object. Created lazily on first binding in context.
*/
/* 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;
+ struct
st_sampler_view
*sampler_views;
/* 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
/* 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
@@
-111,20
+124,24
@@
struct st_texture_object
*/
enum pipe_format surface_format;
*/
enum pipe_format surface_format;
+ /* When non-zero, samplers should use this level instead of the level
+ * range specified by the GL state.
+ *
+ * This is used for EGL images, which may correspond to a single level out
+ * of an imported pipe_resources with multiple mip levels.
+ */
+ uint level_override;
+
/* When non-zero, samplers should use this layer instead of the one
* specified by the GL state.
*
/* When non-zero, samplers should use this layer instead of the one
* specified by the GL state.
*
- * This is used for VDPAU interop, where imported pipe_resources may be
- * array textures (containing layers with different fields) even though the
- * GL state describes one non-array texture per field.
+ * This is used for EGL images and VDPAU interop, where imported
+ * pipe_resources may be cube, 3D, or array textures (containing layers
+ * with different fields in the case of VDPAU) even though the GL state
+ * describes one non-array texture per field.
*/
uint layer_override;
*/
uint layer_override;
- /** The glsl version of the shader seen during the previous validation */
- unsigned prev_glsl_version;
- /** The value of the sampler's sRGBDecode state at the previous validation */
- GLenum prev_sRGBDecode;
-
/**
* Set when the texture images of this texture object might not all be in
* the pipe_resource *pt above.
/**
* Set when the texture images of this texture object might not all be in
* the pipe_resource *pt above.
@@
-259,6
+276,11
@@
st_texture_image_copy(struct pipe_context *pipe,
extern struct pipe_resource *
st_create_color_map_texture(struct gl_context *ctx);
extern struct pipe_resource *
st_create_color_map_texture(struct gl_context *ctx);
+void
+st_destroy_bound_texture_handles(struct st_context *st);
+
+void
+st_destroy_bound_image_handles(struct st_context *st);
bool
st_etc_fallback(struct st_context *st, struct gl_texture_image *texImage);
bool
st_etc_fallback(struct st_context *st, struct gl_texture_image *texImage);
@@
-267,10
+289,16
@@
void
st_convert_image(const struct st_context *st, const struct gl_image_unit *u,
struct pipe_image_view *img);
st_convert_image(const struct st_context *st, const struct gl_image_unit *u,
struct pipe_image_view *img);
+void
+st_convert_image_from_unit(const struct st_context *st,
+ struct pipe_image_view *img,
+ GLuint imgUnit);
+
void
st_convert_sampler(const struct st_context *st,
const struct gl_texture_object *texobj,
const struct gl_sampler_object *msamp,
void
st_convert_sampler(const struct st_context *st,
const struct gl_texture_object *texobj,
const struct gl_sampler_object *msamp,
+ float tex_unit_lod_bias,
struct pipe_sampler_state *sampler);
void
struct pipe_sampler_state *sampler);
void
@@
-278,9
+306,17
@@
st_convert_sampler_from_unit(const struct st_context *st,
struct pipe_sampler_state *sampler,
GLuint texUnit);
struct pipe_sampler_state *sampler,
GLuint texUnit);
-GLboolean
+void
st_update_single_texture(struct st_context *st,
struct pipe_sampler_view **sampler_view,
st_update_single_texture(struct st_context *st,
struct pipe_sampler_view **sampler_view,
- GLuint texUnit, unsigned glsl_version);
+ GLuint texUnit, bool glsl130_or_later);
+
+void
+st_make_bound_samplers_resident(struct st_context *st,
+ struct gl_program *prog);
+
+void
+st_make_bound_images_resident(struct st_context *st,
+ struct gl_program *prog);
#endif
#endif