projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel/decoder: construct correct xml filename
[mesa.git]
/
src
/
mesa
/
drivers
/
common
/
meta.h
diff --git
a/src/mesa/drivers/common/meta.h
b/src/mesa/drivers/common/meta.h
index a41de8bfea60739a3597e8a0f311aaa8df3fbe87..dbe8a9af02f3101fbf5507cc9a77367c33162d5d 100644
(file)
--- a/
src/mesa/drivers/common/meta.h
+++ b/
src/mesa/drivers/common/meta.h
@@
-90,7
+90,7
@@
struct save_state
GLboolean DitherFlag;
/** MESA_META_COLOR_MASK */
GLboolean DitherFlag;
/** MESA_META_COLOR_MASK */
- GL
ubyte ColorMask[MAX_DRAW_BUFFERS][4]
;
+ GL
bitfield ColorMask
;
/** MESA_META_DEPTH_TEST */
struct gl_depthbuffer_attrib Depth;
/** MESA_META_DEPTH_TEST */
struct gl_depthbuffer_attrib Depth;
@@
-158,7
+158,7
@@
struct save_state
/** MESA_META_VIEWPORT */
GLfloat ViewportX, ViewportY, ViewportW, ViewportH;
/** MESA_META_VIEWPORT */
GLfloat ViewportX, ViewportY, ViewportW, ViewportH;
- GLclamp
d
DepthNear, DepthFar;
+ GLclamp
f
DepthNear, DepthFar;
/** MESA_META_CLAMP_FRAGMENT_COLOR */
GLenum ClampFragmentColor;
/** MESA_META_CLAMP_FRAGMENT_COLOR */
GLenum ClampFragmentColor;
@@
-190,7
+190,7
@@
struct save_state
struct gl_framebuffer *ReadBuffer;
/** MESA_META_DRAW_BUFFERS */
struct gl_framebuffer *ReadBuffer;
/** MESA_META_DRAW_BUFFERS */
- GLenum ColorDrawBuffers[MAX_DRAW_BUFFERS];
+ GLenum
16
ColorDrawBuffers[MAX_DRAW_BUFFERS];
};
/**
};
/**
@@
-200,7
+200,7
@@
struct save_state
*/
struct temp_texture
{
*/
struct temp_texture
{
-
GLuint TexO
bj;
+
struct gl_texture_object *tex_o
bj;
GLenum Target; /**< GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE */
GLsizei MinSize; /**< Min texture size to allocate */
GLsizei MaxSize; /**< Max possible texture size */
GLenum Target; /**< GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE */
GLsizei MinSize; /**< Min texture size to allocate */
GLsizei MaxSize; /**< Max possible texture size */
@@
-312,8
+312,9
@@
struct fb_tex_blit_state
GLint baseLevelSave, maxLevelSave;
struct gl_sampler_object *samp_obj;
struct gl_sampler_object *samp_obj_save;
GLint baseLevelSave, maxLevelSave;
struct gl_sampler_object *samp_obj;
struct gl_sampler_object *samp_obj_save;
+ struct gl_texture_object *tex_obj;
+ struct gl_texture_object *temp_tex_obj;
GLuint stencilSamplingSave;
GLuint stencilSamplingSave;
- GLuint tempTex;
};
};
@@
-463,8
+464,8
@@
_mesa_meta_fb_tex_blit_end(struct gl_context *ctx, GLenum target,
struct fb_tex_blit_state *blit);
extern struct gl_texture_object *
struct fb_tex_blit_state *blit);
extern struct gl_texture_object *
-_mesa_meta_
bind_rb_as_tex_image
(struct gl_context *ctx,
- struct gl_renderbuffer *rb);
+_mesa_meta_
texture_object_from_renderbuffer
(struct gl_context *ctx,
+
struct gl_renderbuffer *rb);
struct gl_sampler_object *
_mesa_meta_setup_sampler(struct gl_context *ctx,
struct gl_sampler_object *
_mesa_meta_setup_sampler(struct gl_context *ctx,