X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fcommon%2Fmeta.h;h=dbe8a9af02f3101fbf5507cc9a77367c33162d5d;hb=29a2eaf3db1520a5bc7b80d39c0feac1d2165388;hp=b2c550f89de4194d18be6c41a6ea594c9b7911e1;hpb=3ed44fab1811a2112d3b10233640b5aa369b2d21;p=mesa.git diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index b2c550f89de..dbe8a9af02f 100644 --- 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 */ - GLubyte ColorMask[MAX_DRAW_BUFFERS][4]; + GLbitfield ColorMask; /** MESA_META_DEPTH_TEST */ struct gl_depthbuffer_attrib Depth; @@ -121,11 +121,11 @@ struct save_state /** MESA_META_SHADER */ GLboolean VertexProgramEnabled; - struct gl_vertex_program *VertexProgram; + struct gl_program *VertexProgram; GLboolean FragmentProgramEnabled; - struct gl_fragment_program *FragmentProgram; + struct gl_program *FragmentProgram; GLboolean ATIFragmentShaderEnabled; - struct gl_shader_program *Shader[MESA_SHADER_STAGES]; + struct gl_program *Program[MESA_SHADER_STAGES]; struct gl_shader_program *ActiveShader; struct gl_pipeline_object *Pipeline; @@ -158,7 +158,7 @@ struct save_state /** MESA_META_VIEWPORT */ GLfloat ViewportX, ViewportY, ViewportW, ViewportH; - GLclampd DepthNear, DepthFar; + GLclampf DepthNear, DepthFar; /** MESA_META_CLAMP_FRAGMENT_COLOR */ GLenum ClampFragmentColor; @@ -190,7 +190,7 @@ struct save_state struct gl_framebuffer *ReadBuffer; /** MESA_META_DRAW_BUFFERS */ - GLenum ColorDrawBuffers[MAX_DRAW_BUFFERS]; + GLenum16 ColorDrawBuffers[MAX_DRAW_BUFFERS]; }; /** @@ -200,7 +200,7 @@ struct save_state */ struct temp_texture { - GLuint TexObj; + struct gl_texture_object *tex_obj; GLenum Target; /**< GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE */ GLsizei MinSize; /**< Min texture size to allocate */ GLsizei MaxSize; /**< Max possible texture size */ @@ -218,7 +218,7 @@ struct blit_shader { const char *type; const char *func; const char *texcoords; - GLuint shader_prog; + struct gl_shader_program *shader_prog; }; /** @@ -302,7 +302,7 @@ struct blit_state struct gl_buffer_object *buf_obj; struct blit_shader_table shaders_with_depth; struct blit_shader_table shaders_without_depth; - GLuint msaa_shaders[BLIT_MSAA_SHADER_COUNT]; + struct gl_shader_program *msaa_shaders[BLIT_MSAA_SHADER_COUNT]; struct temp_texture depthTex; bool no_ctsi_fallback; }; @@ -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; + struct gl_texture_object *tex_obj; + struct gl_texture_object *temp_tex_obj; GLuint stencilSamplingSave; - GLuint tempTex; }; @@ -324,8 +325,8 @@ struct clear_state { GLuint VAO; struct gl_buffer_object *buf_obj; - GLuint ShaderProg; - GLuint IntegerShaderProg; + struct gl_shader_program *ShaderProg; + struct gl_shader_program *IntegerShaderProg; }; @@ -382,7 +383,7 @@ struct gen_mipmap_state struct decompress_fbo_state { struct gl_renderbuffer *rb; - GLuint FBO; + struct gl_framebuffer *fb; GLint Width, Height; }; @@ -462,12 +463,9 @@ extern void _mesa_meta_fb_tex_blit_end(struct gl_context *ctx, GLenum target, struct fb_tex_blit_state *blit); -extern GLboolean -_mesa_meta_bind_rb_as_tex_image(struct gl_context *ctx, - struct gl_renderbuffer *rb, - GLuint *tex, - struct gl_texture_object **texObj, - GLenum *target); +extern struct gl_texture_object * +_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, @@ -492,16 +490,6 @@ _mesa_meta_and_swrast_BlitFramebuffer(struct gl_context *ctx, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -bool -_mesa_meta_CopyImageSubData_uncompressed(struct gl_context *ctx, - struct gl_texture_image *src_tex_image, - struct gl_renderbuffer *src_renderbuffer, - int src_x, int src_y, int src_z, - struct gl_texture_image *dst_tex_image, - struct gl_renderbuffer *dst_renderbuffer, - int dst_x, int dst_y, int dst_z, - int src_width, int src_height); - extern void _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers); @@ -530,23 +518,6 @@ extern void _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, struct gl_texture_object *texObj); -extern bool -_mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, - struct gl_texture_image *tex_image, - int xoffset, int yoffset, int zoffset, - int width, int height, int depth, - GLenum format, GLenum type, const void *pixels, - bool allocate_storage, bool create_pbo, - const struct gl_pixelstore_attrib *packing); - -extern bool -_mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims, - struct gl_texture_image *tex_image, - int xoffset, int yoffset, int zoffset, - int width, int height, int depth, - GLenum format, GLenum type, const void *pixels, - const struct gl_pixelstore_attrib *packing); - extern void _mesa_meta_CopyTexSubImage(struct gl_context *ctx, GLuint dims, struct gl_texture_image *texImage, @@ -577,20 +548,20 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, void _mesa_meta_drawbuffers_from_bitfield(GLbitfield bits); -GLuint -_mesa_meta_compile_shader_with_debug(struct gl_context *ctx, GLenum target, - const GLcharARB *source); - - -GLuint -_mesa_meta_link_program_with_debug(struct gl_context *ctx, GLuint program); +void +_mesa_meta_link_program_with_debug(struct gl_context *ctx, + struct gl_shader_program *sh_prog); void _mesa_meta_compile_and_link_program(struct gl_context *ctx, const char *vs_source, const char *fs_source, const char *name, - GLuint *program); + struct gl_shader_program **sh_prog_ptr); + +extern void +_mesa_meta_use_program(struct gl_context *ctx, + struct gl_shader_program *sh_prog); GLboolean _mesa_meta_alloc_texture(struct temp_texture *tex, @@ -655,7 +626,8 @@ void _mesa_meta_glsl_blit_cleanup(struct gl_context *ctx, struct blit_state *blit); void -_mesa_meta_blit_shader_table_cleanup(struct blit_shader_table *table); +_mesa_meta_blit_shader_table_cleanup(struct gl_context *ctx, + struct blit_shader_table *table); void _mesa_meta_glsl_generate_mipmap_cleanup(struct gl_context *ctx,