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

r300g: Use util_format_name().

Browse Source
This commit is contained in:
José Fonseca
2010-02-14 13:25:22 +00:00
parent 6f5e0539dc
commit 06f76e4a6b
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_screen.c
+2 -2
View File
@@ -277,7 +277,7 @@ static boolean r300_is_format_supported(struct pipe_screen* screen,
case PIPE_FORMAT_X8Z24_UNORM:
SCREEN_DBG(r300_screen(screen), DBG_TEX,
"r300: Note: Got unsupported format: %s in %s\n",
pf_name(format), __FUNCTION__);
util_format_name(format), __FUNCTION__);
return FALSE;
/* XXX Add all remaining gallium-supported formats,
@@ -286,7 +286,7 @@ static boolean r300_is_format_supported(struct pipe_screen* screen,
default:
/* Unknown format... */
debug_printf("r300: Warning: Got unknown format: %s in %s\n",
pf_name(format), __FUNCTION__);
util_format_name(format), __FUNCTION__);
break;
}
src/gallium/drivers/r300/r300_state_inlines.h
+8 -8
View File
@@ -367,7 +367,7 @@ static INLINE uint32_t r300_translate_colorformat(enum pipe_format format)
default:
debug_printf("r300: Implementation error: "
"Got unsupported color format %s in %s\n",
pf_name(format), __FUNCTION__);
util_format_name(format), __FUNCTION__);
assert(0);
break;
}
@@ -389,7 +389,7 @@ static INLINE uint32_t r300_translate_zsformat(enum pipe_format format)
default:
debug_printf("r300: Implementation error: "
"Got unsupported ZS format %s in %s\n",
pf_name(format), __FUNCTION__);
util_format_name(format), __FUNCTION__);
assert(0);
break;
}
@@ -428,7 +428,7 @@ static INLINE uint32_t r300_translate_out_fmt(enum pipe_format format)
default:
debug_printf("r300: Implementation error: "
"Got unsupported output format %s in %s\n",
pf_name(format), __FUNCTION__);
util_format_name(format), __FUNCTION__);
assert(0);
return R300_US_OUT_FMT_UNUSED;
}
@@ -494,7 +494,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
if (desc->layout != UTIL_FORMAT_LAYOUT_ARITH &&
desc->layout != UTIL_FORMAT_LAYOUT_ARRAY) {
debug_printf("r300: Bad format %s in %s:%d\n", pf_name(format),
debug_printf("r300: Bad format %s in %s:%d\n", util_format_name(format),
__FUNCTION__, __LINE__);
assert(0);
}
@@ -508,7 +508,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
break;
default:
debug_printf("r300: Bad format %s in %s:%d\n",
pf_name(format), __FUNCTION__, __LINE__);
util_format_name(format), __FUNCTION__, __LINE__);
assert(0);
}
break;
@@ -529,7 +529,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
break;
default:
debug_printf("r300: Bad format %s in %s:%d\n",
pf_name(format), __FUNCTION__, __LINE__);
util_format_name(format), __FUNCTION__, __LINE__);
debug_printf("r300: util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 0) == %d\n",
util_format_get_component_bits(format, UTIL_FORMAT_COLORSPACE_RGB, 0));
assert(0);
@@ -537,7 +537,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
break;
default:
debug_printf("r300: Bad format %s in %s:%d\n",
pf_name(format), __FUNCTION__, __LINE__);
util_format_name(format), __FUNCTION__, __LINE__);
assert(0);
}
@@ -561,7 +561,7 @@ r300_translate_vertex_data_swizzle(enum pipe_format format) {
if (desc->layout != UTIL_FORMAT_LAYOUT_ARITH &&
desc->layout != UTIL_FORMAT_LAYOUT_ARRAY) {
debug_printf("r300: Bad format %s in %s:%d\n",
pf_name(format), __FUNCTION__, __LINE__);
util_format_name(format), __FUNCTION__, __LINE__);
return 0;
}
src/gallium/drivers/r300/r300_texture.c
+1 -1
View File
@@ -173,7 +173,7 @@ static void r300_setup_miptree(struct r300_screen* screen,
unsigned stride, size, layer_size, nblocksy, i;
SCREEN_DBG(screen, DBG_TEX, "r300: Making miptree for texture, format %s\n",
pf_name(base->format));
util_format_name(base->format));
for (i = 0; i <= base->last_level; i++) {
stride = r300_texture_get_stride(screen, tex, i);
src/gallium/drivers/r300/r300_texture.h
+2 -1
View File
@@ -24,6 +24,7 @@
#define R300_TEXTURE_H
#include "pipe/p_video_state.h"
#include "util/u_format.h"
#include "r300_reg.h"
@@ -109,7 +110,7 @@ static INLINE uint32_t r300_translate_texformat(enum pipe_format format)
default:
debug_printf("r300: Implementation error: "
"Got unsupported texture format %s in %s\n",
pf_name(format), __FUNCTION__);
util_format_name(format), __FUNCTION__);
assert(0);
break;
}