diff options
| author | Kristian Høgsberg <[email protected]> | 2014-08-07 16:13:01 -0700 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2014-08-14 13:57:26 -0700 |
| commit | 221d9c3e9c043d96dcd0df9f996cb15daaeffe47 (patch) | |
| tree | 2b286eaeaadf450ec7910643dceb3d92433a7831 | |
| parent | 416dd873e8e0cbca1477344a94a7c2e0c9a6c25b (diff) | |
i965: Rename intelValidateState to intel_update_state
This matches the name of the dd hook. Also convert a couple of nearby
dd implementations to lowercase + underscore as is now the standard.
Signed-off-by: Kristian Høgsberg <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 14 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index bf2aedbabe4..6f621e0db42 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -123,7 +123,7 @@ brw_get_renderer_string(unsigned deviceID) } static const GLubyte * -intelGetString(struct gl_context * ctx, GLenum name) +intel_get_string(struct gl_context * ctx, GLenum name) { const struct brw_context *const brw = brw_context(ctx); @@ -153,7 +153,7 @@ intel_viewport(struct gl_context *ctx) } static void -intelInvalidateState(struct gl_context * ctx, GLuint new_state) +intel_update_state(struct gl_context * ctx, GLuint new_state) { struct brw_context *brw = brw_context(ctx); @@ -209,8 +209,8 @@ intel_glFlush(struct gl_context *ctx) brw->need_throttle = true; } -void -intelFinish(struct gl_context * ctx) +static void +intel_finish(struct gl_context * ctx) { struct brw_context *brw = brw_context(ctx); @@ -237,9 +237,9 @@ brw_init_driver_functions(struct brw_context *brw, functions->Viewport = intel_viewport; functions->Flush = intel_glFlush; - functions->Finish = intelFinish; - functions->GetString = intelGetString; - functions->UpdateState = intelInvalidateState; + functions->Finish = intel_finish; + functions->GetString = intel_get_string; + functions->UpdateState = intel_update_state; intelInitTextureFuncs(functions); intelInitTextureImageFuncs(functions); diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 157a605365c..2367a95e6af 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1373,8 +1373,6 @@ extern const char *const brw_vendor_string; extern const char *brw_get_renderer_string(unsigned deviceID); -extern void intelFinish(struct gl_context * ctx); - enum { DRI_CONF_BO_REUSE_DISABLED, DRI_CONF_BO_REUSE_ALL |