From: Francisco Jerez <currojerez@riseup.net>
Date: Fri, 17 Sep 2010 13:03:14 +0000 (+0200)
Subject: dri/nv04: Use nvgl_wrap_mode().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72e5fd5c02cb745d95f11573e7119ad1ba4bc1a8;p=mesa.git

dri/nv04: Use nvgl_wrap_mode().
---

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
index 4ac8327b871..b720089fbf0 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c
@@ -55,24 +55,6 @@ get_tex_format(struct gl_texture_image *ti)
 	}
 }
 
-static inline unsigned
-get_wrap_mode(unsigned wrap)
-{
-	switch (wrap) {
-	case GL_REPEAT:
-		return 0x1;
-	case GL_MIRRORED_REPEAT:
-		return 0x2;
-	case GL_CLAMP:
-	case GL_CLAMP_TO_EDGE:
-		return 0x3;
-	case GL_CLAMP_TO_BORDER:
-		return 0x4;
-	default:
-		assert(0);
-	}
-}
-
 void
 nv04_emit_tex_obj(GLcontext *ctx, int emit)
 {
@@ -106,8 +88,8 @@ nv04_emit_tex_obj(GLcontext *ctx, int emit)
 					 t->LodBias, -16, 15) * 8;
 		}
 
-		format |= get_wrap_mode(t->WrapT) << 28 |
-			get_wrap_mode(t->WrapS) << 24 |
+		format |= nvgl_wrap_mode(t->WrapT) << 28 |
+			nvgl_wrap_mode(t->WrapS) << 24 |
 			ti->HeightLog2 << 20 |
 			ti->WidthLog2 << 16 |
 			lod_max << 12 |