OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

965: remove duplicate brw_draw functions, make init a bit cleaner

Browse Source
This commit is contained in:
Keith Whitwell
2007-12-11 17:07:31 +00:00
parent ecb5e14e86
commit b247ab0363
3 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/mesa/pipe/i965simple/brw_context.c
View File

@@ -195,37 +195,8 @@ brw_is_format_supported( struct pipe_context *pipe,
#endif #endif
} }
static void
brw_begin_query(struct pipe_context *pipe, struct pipe_query_object *q)
{
/* should never be called */
assert(0);
}
static void
brw_end_query(struct pipe_context *pipe, struct pipe_query_object *q)
{
/* should never be called */
assert(0);
}
static boolean
brw_draw_elements(struct pipe_context *pipe,
struct pipe_buffer_handle *indexBuffer,
unsigned indexSize,
unsigned prim, unsigned start, unsigned count)
{
return FALSE;
}
static boolean brw_draw_arrays(struct pipe_context *pipe,
unsigned prim, unsigned start, unsigned count)
{
return brw_draw_elements(pipe, NULL, 0, prim, start, count);
}
struct pipe_context *brw_create(struct pipe_winsys *pipe_winsys, struct pipe_context *brw_create(struct pipe_winsys *pipe_winsys,
struct brw_winsys *brw_winsys, struct brw_winsys *brw_winsys,
@@ -248,40 +219,26 @@ struct pipe_context *brw_create(struct pipe_winsys *pipe_winsys,
brw->pipe.is_format_supported = brw_is_format_supported; brw->pipe.is_format_supported = brw_is_format_supported;
brw->pipe.get_param = brw_get_param; brw->pipe.get_param = brw_get_param;
brw->pipe.get_paramf = brw_get_paramf; brw->pipe.get_paramf = brw_get_paramf;
brw->pipe.clear = brw_clear; brw->pipe.clear = brw_clear;
brw->pipe.texture_create = brw_texture_create;
brw->pipe.begin_query = brw_begin_query; brw->pipe.texture_release = brw_texture_release;
brw->pipe.end_query = brw_end_query;
brw->pipe.draw_arrays = brw_draw_arrays;
brw->pipe.draw_elements = brw_draw_elements;
brw_init_surface_functions(brw); brw_init_surface_functions(brw);
brw_init_state_functions(brw); brw_init_state_functions(brw);
brw_init_flush_functions(brw); brw_init_flush_functions(brw);
brw_init_string_functions(brw); brw_init_string_functions(brw);
brw_init_draw_functions( brw );
brw->pci_id = pci_id;
brw->pipe.texture_create = brw_texture_create;
brw->pipe.texture_release = brw_texture_release;
brw->dirty = ~0;
brw->hardware_dirty = ~0;
/* Batch stream debugging is a bit hacked up at the moment:
*/
brw->batch_start = NULL;
brw_init_state( brw ); brw_init_state( brw );
brw->pci_id = pci_id;
brw->dirty = ~0;
brw->hardware_dirty = ~0;
brw->batch_start = NULL;
memset(&brw->wm.bind, ~0, sizeof(brw->wm.bind)); memset(&brw->wm.bind, ~0, sizeof(brw->wm.bind));
brw_draw_init( brw );
return &brw->pipe; return &brw->pipe;
} }

5
src/mesa/pipe/i965simple/brw_draw.c
View File

@@ -226,13 +226,10 @@ static boolean brw_draw_arrays( struct pipe_context *pipe,
void brw_draw_init( struct brw_context *brw ) void brw_init_draw_functions( struct brw_context *brw )
{ {
brw->pipe.draw_arrays = brw_draw_arrays; brw->pipe.draw_arrays = brw_draw_arrays;
brw->pipe.draw_elements = brw_draw_elements; brw->pipe.draw_elements = brw_draw_elements;
} }
void brw_draw_destroy( struct brw_context *brw )
{
}

3
src/mesa/pipe/i965simple/brw_draw.h
View File

@@ -34,8 +34,7 @@ struct brw_context;
void brw_draw_init( struct brw_context *brw ); void brw_init_draw_functions( struct brw_context *brw );
void brw_draw_destroy( struct brw_context *brw );
boolean brw_upload_vertices( struct brw_context *brw, boolean brw_upload_vertices( struct brw_context *brw,