From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 18 Jul 2017 16:51:30 +0000 (+0200)
Subject: mesa: add bind_sampler() helper
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6fd8255c2a3a4edd8ed59e6e9249afabbd2b1754;p=mesa.git

mesa: add bind_sampler() helper

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index cdfd753a8b9..260cff6450a 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -295,27 +295,20 @@ _mesa_bind_sampler(struct gl_context *ctx, GLuint unit,
                                   sampObj);
 }
 
-void GLAPIENTRY
-_mesa_BindSampler(GLuint unit, GLuint sampler)
+static ALWAYS_INLINE void
+bind_sampler(struct gl_context *ctx, GLuint unit, GLuint sampler, bool no_error)
 {
    struct gl_sampler_object *sampObj;
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (unit >= ctx->Const.MaxCombinedTextureImageUnits) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glBindSampler(unit %u)", unit);
-      return;
-   }
 
    if (sampler == 0) {
       /* Use the default sampler object, the one contained in the texture
        * object.
        */
       sampObj = NULL;
-   }
-   else {
+   } else {
       /* user-defined sampler object */
       sampObj = _mesa_lookup_samplerobj(ctx, sampler);
-      if (!sampObj) {
+      if (!no_error && !sampObj) {
          _mesa_error(ctx, GL_INVALID_OPERATION, "glBindSampler(sampler)");
          return;
       }
@@ -325,6 +318,19 @@ _mesa_BindSampler(GLuint unit, GLuint sampler)
    _mesa_bind_sampler(ctx, unit, sampObj);
 }
 
+void GLAPIENTRY
+_mesa_BindSampler(GLuint unit, GLuint sampler)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (unit >= ctx->Const.MaxCombinedTextureImageUnits) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glBindSampler(unit %u)", unit);
+      return;
+   }
+
+   bind_sampler(ctx, unit, sampler, false);
+}
+
 
 static ALWAYS_INLINE void
 bind_samplers(struct gl_context *ctx, GLuint first, GLsizei count,