diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-09 01:52:45 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-13 15:20:23 +0300 |
| commit | 854c999d827cfb78938c3b4605707b891092d001 (patch) | |
| tree | 6d066bbaa52689ddb6c5b4bcd692ab3e4da03dcb /source/blender/gpu/opengl/gl_drawlist.cc | |
| parent | 186abf7d3bab9ed8b905c6914de02427bb2547cf (diff) | |
GPUShader: Change shader state tracking to be part of the GPUContext
This remove the use of batch->program and replace it with batch->shader.
This will allow GL abstraction latter.
Diffstat (limited to 'source/blender/gpu/opengl/gl_drawlist.cc')
| -rw-r--r-- | source/blender/gpu/opengl/gl_drawlist.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/gpu/opengl/gl_drawlist.cc b/source/blender/gpu/opengl/gl_drawlist.cc index f24bfdc8751..e801a28ec52 100644 --- a/source/blender/gpu/opengl/gl_drawlist.cc +++ b/source/blender/gpu/opengl/gl_drawlist.cc @@ -184,8 +184,7 @@ void GLDrawList::submit(void) /* Something's wrong if we get here without MDI support. */ BLI_assert(MDI_ENABLED); BLI_assert(data_); - /* TODO fix this assert */ - // BLI_assert(batch_->program_in_use); + BLI_assert(GPU_context_active_get()->shader != NULL); /* TODO could assert that VAO is bound. */ /* Only do multi-draw indirect if doing more than 2 drawcall. This avoids the overhead of |