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

r300g: DCE.

Browse Source 
This must never have been called before; it's completely wrong.
This commit is contained in:
Corbin Simpson
2009-11-07 14:14:19 -08:00
parent 9f49db6f84
commit 547e939afb
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_state_inlines.h
+1 -1
View File
@@ -436,7 +436,7 @@ r300_translate_vertex_data_type(enum pipe_format format) {
if (pf_layout(format) != PIPE_FORMAT_LAYOUT_RGBAZS) {
debug_printf("r300: Bad format %s in %s:%d\n", pf_name(format),
__FUNCTION__, __LINE__);
return 0;
assert(0);
}
switch (pf_type(format)) {
src/gallium/drivers/r300/r300_vbo.c
+1 -26
View File
@@ -79,30 +79,6 @@ void setup_vertex_attributes(struct r300_context *r300)
finish_vertex_attribs_setup(r300->vertex_info, r300->aos_count);
}
/* XXX move/integrate this with the checks in r300_state_inlines */
static boolean format_is_supported(enum pipe_format format, int nr_components)
{
if (pf_layout(format) != PIPE_FORMAT_LAYOUT_RGBAZS)
return FALSE;
if ((pf_size_x(format) != pf_size_y(format)) ||
(pf_size_x(format) != pf_size_z(format)) ||
(pf_size_x(format) != pf_size_w(format)))
return FALSE;
/* Following should be supported as long as stride is 4 bytes aligned */
if (pf_size_x(format) != 1 && nr_components != 4)
return FALSE;
if (pf_size_x(format) != 2 && !(nr_components == 2 || nr_components == 4))
return FALSE;
if (pf_size_x(format) == 3 || pf_size_x(format) > 4)
return FALSE;
return TRUE;
}
static INLINE int get_buffer_offset(struct r300_context *r300,
unsigned int buf_nr,
unsigned int elem_offset)
@@ -110,8 +86,7 @@ static INLINE int get_buffer_offset(struct r300_context *r300,
return r300->vertex_buffer[buf_nr].buffer_offset + elem_offset;
}
/**
*/
/* XXX not called at all */
static void setup_vertex_buffers(struct r300_context *r300)
{
struct pipe_vertex_element *vert_elem;