diff options
| author | Mark Mueller <[email protected]> | 2014-01-04 14:11:43 -0800 |
|---|---|---|
| committer | Mark Mueller <[email protected]> | 2014-01-27 14:28:46 -0800 |
| commit | 71fe9437169cfdafda8814aa814bb85429fb6cfc (patch) | |
| tree | 7eb5b04c681c7347de9dd5b0a69aa4f75343293d /src/mesa/drivers/dri/r200 | |
| parent | bc0ed682757607172eca6b8a7031c81a73287524 (diff) | |
mesa: change gl_format to mesa_format
s/\bgl_format\b/mesa_format/g. Use better name for Mesa Formats enum
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_blit.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_blit.h | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_texstate.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_blit.c b/src/mesa/drivers/dri/r200/r200_blit.c index 666fbadc9f8..825358a4fbe 100644 --- a/src/mesa/drivers/dri/r200/r200_blit.c +++ b/src/mesa/drivers/dri/r200/r200_blit.c @@ -38,7 +38,7 @@ static inline uint32_t cmdpacket0(struct radeon_screen *rscrn, } /* common formats supported as both textures and render targets */ -unsigned r200_check_blit(gl_format mesa_format, uint32_t dst_pitch) +unsigned r200_check_blit(mesa_format mesa_format, uint32_t dst_pitch) { /* XXX others? BE/LE? */ switch (mesa_format) { @@ -97,8 +97,8 @@ static inline void emit_vtx_state(struct r200_context *r200) } static void inline emit_tx_setup(struct r200_context *r200, - gl_format src_mesa_format, - gl_format dst_mesa_format, + mesa_format src_mesa_format, + mesa_format dst_mesa_format, struct radeon_bo *bo, intptr_t offset, unsigned width, @@ -297,7 +297,7 @@ static void inline emit_tx_setup(struct r200_context *r200, static inline void emit_cb_setup(struct r200_context *r200, struct radeon_bo *bo, intptr_t offset, - gl_format mesa_format, + mesa_format mesa_format, unsigned pitch, unsigned width, unsigned height) @@ -463,7 +463,7 @@ static inline void emit_draw_packet(struct r200_context *r200, unsigned r200_blit(struct gl_context *ctx, struct radeon_bo *src_bo, intptr_t src_offset, - gl_format src_mesaformat, + mesa_format src_mesaformat, unsigned src_pitch, unsigned src_width, unsigned src_height, @@ -471,7 +471,7 @@ unsigned r200_blit(struct gl_context *ctx, unsigned src_y_offset, struct radeon_bo *dst_bo, intptr_t dst_offset, - gl_format dst_mesaformat, + mesa_format dst_mesaformat, unsigned dst_pitch, unsigned dst_width, unsigned dst_height, diff --git a/src/mesa/drivers/dri/r200/r200_blit.h b/src/mesa/drivers/dri/r200/r200_blit.h index fb5dacbe870..23057476336 100644 --- a/src/mesa/drivers/dri/r200/r200_blit.h +++ b/src/mesa/drivers/dri/r200/r200_blit.h @@ -30,12 +30,12 @@ void r200_blit_init(struct r200_context *r200); -unsigned r200_check_blit(gl_format mesa_format, uint32_t dst_pitch); +unsigned r200_check_blit(mesa_format mesa_format, uint32_t dst_pitch); unsigned r200_blit(struct gl_context *ctx, struct radeon_bo *src_bo, intptr_t src_offset, - gl_format src_mesaformat, + mesa_format src_mesaformat, unsigned src_pitch, unsigned src_width, unsigned src_height, @@ -43,7 +43,7 @@ unsigned r200_blit(struct gl_context *ctx, unsigned src_y_offset, struct radeon_bo *dst_bo, intptr_t dst_offset, - gl_format dst_mesaformat, + mesa_format dst_mesaformat, unsigned dst_pitch, unsigned dst_width, unsigned dst_height, diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index f655bc184a3..12afb767bda 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -721,7 +721,7 @@ void r200SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format struct radeon_framebuffer *rfb; radeonTexObjPtr t; uint32_t pitch_val; - gl_format texFormat; + mesa_format texFormat; radeon = pDRICtx->driverPrivate; |