diff options
| author | Timothy Arceri <[email protected]> | 2017-06-28 13:47:42 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-06-29 08:54:10 +1000 |
| commit | 8e77fceedbd2b030906bacc7c524a77997ae11a1 (patch) | |
| tree | 9fa93bec38debe2e24ec0e626fc6b4d327d94440 /src | |
| parent | ccbcb3ca17d68358f1c75a9440e4062785723f90 (diff) | |
mesa: add KHR_no_error support for glLogicOp()
Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/blend.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/blend.h | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index a63fd3c918f..b49ea916432 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -2551,7 +2551,7 @@ <glx rop="160"/> </function> - <function name="LogicOp" es1="1.0"> + <function name="LogicOp" es1="1.0" no_error="true"> <param name="opcode" type="GLenum"/> <glx rop="161"/> </function> diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 541c24852d5..3fa9678730d 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -816,6 +816,14 @@ _mesa_LogicOp( GLenum opcode ) void GLAPIENTRY +_mesa_LogicOp_no_error(GLenum opcode) +{ + GET_CURRENT_CONTEXT(ctx); + logic_op(ctx, opcode); +} + + +void GLAPIENTRY _mesa_IndexMask( GLuint mask ) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h index 675e50d3886..b0a8cbd200b 100644 --- a/src/mesa/main/blend.h +++ b/src/mesa/main/blend.h @@ -98,6 +98,10 @@ _mesa_LogicOp( GLenum opcode ); extern void GLAPIENTRY +_mesa_LogicOp_no_error(GLenum opcode); + + +extern void GLAPIENTRY _mesa_IndexMask( GLuint mask ); extern void GLAPIENTRY |