summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2011-04-29 01:18:20 -0700
committerKenneth Graunke <[email protected]>2011-05-17 23:33:01 -0700
commit3984372104ec6ac5986dedb07b8ca99d53dede18 (patch)
tree911ce9899a1de6633957213f01be2debd5cc2934 /src/mesa
parentb2b6cc662271d611462532222ef2fcc30042bd0f (diff)
i965: Mark some brw_wm_sampler_state.c helper functions as non-static.
Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_state.h6
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm_sampler_state.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index 4bf4e854f81..e58840f6787 100644
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -191,6 +191,12 @@ GLuint translate_tex_format(gl_format mesa_format,
GLenum depth_mode,
GLenum srgb_decode);
+/* brw_wm_sampler_state.c */
+GLuint translate_wrap_mode(GLenum wrap);
+void upload_default_color(struct brw_context *brw,
+ struct gl_sampler_object *sampler,
+ int unit);
+
/* gen6_sf_state.c */
uint32_t
get_attr_override(struct brw_context *brw, int fs_attr, int two_side_color);
diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
index 7b93bf90241..6f5057b7347 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
@@ -48,7 +48,8 @@
* Intel drivers for "other operating systems" implement GL_CLAMP as
* GL_CLAMP_TO_EDGE, so the same is done here.
*/
-static GLuint translate_wrap_mode( GLenum wrap )
+GLuint
+translate_wrap_mode(GLenum wrap)
{
switch( wrap ) {
case GL_REPEAT:
@@ -66,7 +67,7 @@ static GLuint translate_wrap_mode( GLenum wrap )
}
}
-static void
+void
upload_default_color(struct brw_context *brw, struct gl_sampler_object *sampler,
int unit)
{