From 9848a422879e0b5fef5930bfcb105b01d94f3bab Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 27 Sep 2013 14:42:43 -0700 Subject: [PATCH] i965: Merge intelInitFunctions() and brwInitFunctions(). They do exactly the same thing. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/brw_context.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index fd1dabaadcb..740a33ae4d5 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -208,10 +208,9 @@ intelFinish(struct gl_context * ctx) drm_intel_bo_wait_rendering(brw->batch.last_bo); } - - -void -intelInitDriverFunctions(struct dd_function_table *functions) +static void +brwInitDriverFunctions(struct intel_screen *screen, + struct dd_function_table *functions) { _mesa_init_driver_functions(functions); @@ -230,12 +229,6 @@ intelInitDriverFunctions(struct dd_function_table *functions) intelInitBufferObjectFuncs(functions); intel_init_syncobj_functions(functions); brw_init_object_purgeable_functions(functions); -} - -static void brwInitDriverFunctions(struct intel_screen *screen, - struct dd_function_table *functions) -{ - intelInitDriverFunctions( functions ); brwInitFragProgFuncs( functions ); brw_init_common_queryobj_functions(functions);