KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: rename functions to be more consistant with rest of mesa

This commit is contained in:
Brian Paul 2009-09-19 17:06:15 -06:00
parent 232fc7d333
commit 4de8e2123e
9 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/mesa/drivers/common/meta.c
View File

@ -274,12 +274,12 @@ struct gl_meta_state
struct temp_texture TempTex;
struct blit_state Blit; /**< For _mesa_meta_blit_framebuffer() */
struct clear_state Clear; /**< For _mesa_meta_clear() */
struct copypix_state CopyPix; /**< For _mesa_meta_copy_pixels() */
struct drawpix_state DrawPix; /**< For _mesa_meta_draw_pixels() */
struct bitmap_state Bitmap; /**< For _mesa_meta_bitmap() */
struct gen_mipmap_state Mipmap; /**< For _mesa_meta_generate_mipmap() */
struct blit_state Blit; /**< For _mesa_meta_BlitFramebuffer() */
struct clear_state Clear; /**< For _mesa_meta_Clear() */
struct copypix_state CopyPix; /**< For _mesa_meta_CopyPixels() */
struct drawpix_state DrawPix; /**< For _mesa_meta_DrawPixels() */
struct bitmap_state Bitmap; /**< For _mesa_meta_Bitmap() */
struct gen_mipmap_state Mipmap; /**< For _mesa_meta_GenerateMipmap() */
};
@ -1055,10 +1055,10 @@ init_blit_depth_pixels(GLcontext *ctx)
* of texture mapping and polygon rendering.
*/
void
_mesa_meta_blit_framebuffer(GLcontext *ctx,
GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter)
_mesa_meta_BlitFramebuffer(GLcontext *ctx,
GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter)
{
struct blit_state *blit = &ctx->Meta->Blit;
struct temp_texture *tex = get_temp_texture(ctx);
@ -1204,7 +1204,7 @@ _mesa_meta_blit_framebuffer(GLcontext *ctx,
* Meta implementation of ctx->Driver.Clear() in terms of polygon rendering.
*/
void
_mesa_meta_clear(GLcontext *ctx, GLbitfield buffers)
_mesa_meta_Clear(GLcontext *ctx, GLbitfield buffers)
{
struct clear_state *clear = &ctx->Meta->Clear;
struct vertex {
@ -1323,9 +1323,9 @@ _mesa_meta_clear(GLcontext *ctx, GLbitfield buffers)
* of texture mapping and polygon rendering.
*/
void
_mesa_meta_copy_pixels(GLcontext *ctx, GLint srcX, GLint srcY,
GLsizei width, GLsizei height,
GLint dstX, GLint dstY, GLenum type)
_mesa_meta_CopyPixels(GLcontext *ctx, GLint srcX, GLint srcY,
GLsizei width, GLsizei height,
GLint dstX, GLint dstY, GLenum type)
{
struct copypix_state *copypix = &ctx->Meta->CopyPix;
struct temp_texture *tex = get_temp_texture(ctx);
@ -1462,9 +1462,8 @@ tiled_draw_pixels(GLcontext *ctx,
tileUnpack.SkipRows = unpack->SkipRows + j;
_mesa_meta_draw_pixels(ctx, tileX, tileY,
tileWidth, tileHeight,
format, type, &tileUnpack, pixels);
_mesa_meta_DrawPixels(ctx, tileX, tileY, tileWidth, tileHeight,
format, type, &tileUnpack, pixels);
}
}
}
@ -1573,11 +1572,11 @@ init_draw_depth_pixels(GLcontext *ctx)
* of texture mapping and polygon rendering.
*/
void
_mesa_meta_draw_pixels(GLcontext *ctx,
GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *unpack,
const GLvoid *pixels)
_mesa_meta_DrawPixels(GLcontext *ctx,
GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *unpack,
const GLvoid *pixels)
{
struct drawpix_state *drawpix = &ctx->Meta->DrawPix;
struct temp_texture *tex = get_temp_texture(ctx);
@ -1812,7 +1811,7 @@ _mesa_meta_draw_pixels(GLcontext *ctx,
* improve performance a lot.
*/
void
_mesa_meta_bitmap(GLcontext *ctx,
_mesa_meta_Bitmap(GLcontext *ctx,
GLint x, GLint y, GLsizei width, GLsizei height,
const struct gl_pixelstore_attrib *unpack,
const GLubyte *bitmap1)
@ -1953,8 +1952,8 @@ _mesa_meta_bitmap(GLcontext *ctx,
void
_mesa_meta_generate_mipmap(GLcontext *ctx, GLenum target,
struct gl_texture_object *texObj)
_mesa_meta_GenerateMipmap(GLcontext *ctx, GLenum target,
struct gl_texture_object *texObj)
{
struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;
struct vertex {

32
src/mesa/drivers/common/meta.h
View File

@ -34,35 +34,35 @@ extern void
_mesa_meta_free(GLcontext *ctx);
extern void
_mesa_meta_blit_framebuffer(GLcontext *ctx,
GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter);
_mesa_meta_BlitFramebuffer(GLcontext *ctx,
GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter);
extern void
_mesa_meta_clear(GLcontext *ctx, GLbitfield buffers);
_mesa_meta_Clear(GLcontext *ctx, GLbitfield buffers);
extern void
_mesa_meta_copy_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
GLsizei width, GLsizei height,
GLint dstx, GLint dsty, GLenum type);
_mesa_meta_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
GLsizei width, GLsizei height,
GLint dstx, GLint dsty, GLenum type);
extern void
_mesa_meta_draw_pixels(GLcontext *ctx,
GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *unpack,
const GLvoid *pixels);
_mesa_meta_DrawPixels(GLcontext *ctx,
GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *unpack,
const GLvoid *pixels);
extern void
_mesa_meta_bitmap(GLcontext *ctx,
_mesa_meta_Bitmap(GLcontext *ctx,
GLint x, GLint y, GLsizei width, GLsizei height,
const struct gl_pixelstore_attrib *unpack,
const GLubyte *bitmap);
extern void
_mesa_meta_generate_mipmap(GLcontext *ctx, GLenum target,
struct gl_texture_object *texObj);
_mesa_meta_GenerateMipmap(GLcontext *ctx, GLenum target,
struct gl_texture_object *texObj);
extern void
_mesa_meta_CopyTexImage1D(GLcontext *ctx, GLenum target, GLint level,

2
src/mesa/drivers/dri/intel/intel_clear.c
View File

@ -171,7 +171,7 @@ intelClear(GLcontext *ctx, GLbitfield mask)
DBG("\n");
}
intelFlush(&intel->ctx);
_mesa_meta_clear(&intel->ctx, tri_mask);
_mesa_meta_Clear(&intel->ctx, tri_mask);
}
if (swrast_mask) {

2
src/mesa/drivers/dri/intel/intel_fbo.c
View File

@ -715,5 +715,5 @@ intel_fbo_init(struct intel_context *intel)
intel->ctx.Driver.FinishRenderTexture = intel_finish_render_texture;
intel->ctx.Driver.ResizeBuffers = intel_resize_buffers;
intel->ctx.Driver.ValidateFramebuffer = intel_validate_framebuffer;
intel->ctx.Driver.BlitFramebuffer = _mesa_meta_blit_framebuffer;
intel->ctx.Driver.BlitFramebuffer = _mesa_meta_BlitFramebuffer;
}

2
src/mesa/drivers/dri/intel/intel_pixel_copy.c
View File

@ -240,5 +240,5 @@ intelCopyPixels(GLcontext * ctx,
return;
/* this will use swrast if needed */
_mesa_meta_copy_pixels(ctx, srcx, srcy, width, height, destx, desty, type);
_mesa_meta_CopyPixels(ctx, srcx, srcy, width, height, destx, desty, type);
}

8
src/mesa/drivers/dri/intel/intel_pixel_draw.c
View File

@ -54,7 +54,7 @@
#include "intel_fbo.h"
/** XXX compare perf of this vs. _mesa_meta_draw_pixels(STENCIL) */
/** XXX compare perf of this vs. _mesa_meta_DrawPixels(STENCIL) */
static GLboolean
intel_stencil_drawpixels(GLcontext * ctx,
GLint x, GLint y,
@ -265,7 +265,7 @@ intelDrawPixels(GLcontext * ctx,
/* XXX this function doesn't seem to work reliably even when all
* the pre-requisite conditions are met.
* Note that this function is never hit with conform.
* Fall back to swrast because even the _mesa_meta_draw_pixels() approach
* Fall back to swrast because even the _mesa_meta_DrawPixels() approach
* isn't working because of an apparent stencil bug.
*/
if (intel_stencil_drawpixels(ctx, x, y, width, height, format, type,
@ -280,6 +280,6 @@ intelDrawPixels(GLcontext * ctx,
}
#endif
_mesa_meta_draw_pixels(ctx, x, y, width, height, format, type,
unpack, pixels);
_mesa_meta_DrawPixels(ctx, x, y, width, height, format, type,
unpack, pixels);
}

2
src/mesa/drivers/dri/radeon/radeon_common.c
View File

@ -1345,5 +1345,5 @@ void rcommonBeginBatch(radeonContextPtr rmesa, int n,
void radeonUserClear(GLcontext *ctx, GLuint mask)
{
_mesa_meta_clear(ctx, mask);
_mesa_meta_Clear(ctx, mask);
}

2
src/mesa/drivers/dri/radeon/radeon_fbo.c
View File

@ -583,7 +583,7 @@ void radeon_fbo_init(struct radeon_context *radeon)
radeon->glCtx->Driver.FinishRenderTexture = radeon_finish_render_texture;
radeon->glCtx->Driver.ResizeBuffers = radeon_resize_buffers;
radeon->glCtx->Driver.ValidateFramebuffer = radeon_validate_framebuffer;
radeon->glCtx->Driver.BlitFramebuffer = _mesa_meta_blit_framebuffer;
radeon->glCtx->Driver.BlitFramebuffer = _mesa_meta_BlitFramebuffer;
}

10
src/mesa/drivers/x11/xm_dd.c
View File

@ -1150,11 +1150,11 @@ xmesa_init_driver_functions( XMesaVisual xmvisual,
driver->Enable = enable;
driver->Viewport = xmesa_viewport;
if (TEST_META_FUNCS) {
driver->Clear = _mesa_meta_clear;
driver->CopyPixels = _mesa_meta_copy_pixels;
driver->BlitFramebuffer = _mesa_meta_blit_framebuffer;
driver->DrawPixels = _mesa_meta_draw_pixels;
driver->Bitmap = _mesa_meta_bitmap;
driver->Clear = _mesa_meta_Clear;
driver->CopyPixels = _mesa_meta_CopyPixels;
driver->BlitFramebuffer = _mesa_meta_BlitFramebuffer;
driver->DrawPixels = _mesa_meta_DrawPixels;
driver->Bitmap = _mesa_meta_Bitmap;
}
else {
driver->Clear = clear_buffers;