Signed-off-by: Samuel Pitoiset <[email protected]>
---
src/mesa/main/samplerobj.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index e84c0277f1..5e29ada334 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -286,27 +286,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;
}
@@ -316,6 +309,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,
--
2.13.3
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
