diff options
| author | Rafael Antognolli <[email protected]> | 2017-01-20 09:53:23 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2017-02-21 16:28:31 -0800 |
| commit | a80ebff1b9954173308b35cd1d6c73c8366522c0 (patch) | |
| tree | 80280540051803329fa67e52958c0b7287603967 /src/mesa/main/condrender.c | |
| parent | 273bab26af543535d34b5e8accfd20c9314debde (diff) | |
mesa: Track transform feedback overflow query objects.
Also update checks on conditional rendering.
Signed-off-by: Rafael Antognolli <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/condrender.c')
| -rw-r--r-- | src/mesa/main/condrender.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 46c6036d2a5..2ea2c8821d8 100644 --- a/src/mesa/main/condrender.c +++ b/src/mesa/main/condrender.c @@ -99,7 +99,9 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode) */ if ((q->Target != GL_SAMPLES_PASSED && q->Target != GL_ANY_SAMPLES_PASSED && - q->Target != GL_ANY_SAMPLES_PASSED_CONSERVATIVE) || q->Active) { + q->Target != GL_ANY_SAMPLES_PASSED_CONSERVATIVE && + q->Target != GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB && + q->Target != GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB) || q->Active) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginConditionalRender()"); return; } |