diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-18 18:53:18 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-07-31 13:53:39 +0200 |
| commit | 33f2b45e265a388e783ababc8ec3440e08823114 (patch) | |
| tree | 39022f3a2beb857233347be62e3b7c0f6c81ebad | |
| parent | 6fd8255c2a3a4edd8ed59e6e9249afabbd2b1754 (diff) | |
mesa: add KHR_no_error support to glBindSampler()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_sampler_objects.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/samplerobj.c | 7 | ||||
| -rw-r--r-- | src/mesa/main/samplerobj.h | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml index 9fe6c41c855..41fb1c0cca1 100644 --- a/src/mapi/glapi/gen/ARB_sampler_objects.xml +++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml @@ -22,7 +22,7 @@ <return type="GLboolean"/> </function> - <function name="BindSampler" es2="3.0"> + <function name="BindSampler" es2="3.0" no_error="true"> <param name="unit" type="GLuint"/> <param name="sampler" type="GLuint"/> </function> diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index 260cff6450a..59ec813013e 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -319,6 +319,13 @@ bind_sampler(struct gl_context *ctx, GLuint unit, GLuint sampler, bool no_error) } void GLAPIENTRY +_mesa_BindSampler_no_error(GLuint unit, GLuint sampler) +{ + GET_CURRENT_CONTEXT(ctx); + bind_sampler(ctx, unit, sampler, true); +} + +void GLAPIENTRY _mesa_BindSampler(GLuint unit, GLuint sampler) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h index eb20df1040d..76c2c124242 100644 --- a/src/mesa/main/samplerobj.h +++ b/src/mesa/main/samplerobj.h @@ -110,6 +110,10 @@ void GLAPIENTRY _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers); GLboolean GLAPIENTRY _mesa_IsSampler(GLuint sampler); + +void GLAPIENTRY +_mesa_BindSampler_no_error(GLuint unit, GLuint sampler); + void GLAPIENTRY _mesa_BindSampler(GLuint unit, GLuint sampler); |