diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-21 14:48:34 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-21 15:16:42 +0300 |
commit | 220fbdf59341f620c06959280e2145132003c5df (patch) | |
tree | 32f1d80da91aee1bbe13e69b7f8ac3c93e429ccc /source/blender/gpu/intern/gpu_vertex_format.cc | |
parent | 1e95a7402c62d2380710a56733e6c4cbe390b3be (diff) |
GPUShader: Make GPUShader* an opaque pointer to blender::gpu::Shader
This avoids the misleading inheritance.
Also cleanup by setting the blender::gpu::Shader as active shader to
avoid some casting.
Diffstat (limited to 'source/blender/gpu/intern/gpu_vertex_format.cc')
-rw-r--r-- | source/blender/gpu/intern/gpu_vertex_format.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_vertex_format.cc b/source/blender/gpu/intern/gpu_vertex_format.cc index 2b16f4482b4..ed317b3a0df 100644 --- a/source/blender/gpu/intern/gpu_vertex_format.cc +++ b/source/blender/gpu/intern/gpu_vertex_format.cc @@ -407,6 +407,6 @@ void VertexFormat_pack(GPUVertFormat *format) void GPU_vertformat_from_shader(GPUVertFormat *format, const struct GPUShader *gpushader) { - const Shader *shader = static_cast<const Shader *>(gpushader); + const Shader *shader = reinterpret_cast<const Shader *>(gpushader); shader->vertformat_from_shader(format); } |