Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-11-30 16:52:46 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-11-30 16:55:46 +0300
commitf61ad0e1017bcf924b0529738c08c3a74d1e7476 (patch)
tree9c09708721736b557a126d39e503f9e2b9ba95ef /source/blender/gpu/intern/gpu_shader.cc
parent6fba2726c77167f8a4746312cb0d522fd43e4c63 (diff)
Fix T83203 BGL: shader.program wrongly always returns 0
This was a leftover from the 2.91 GPU module refactor. This is an exception that should be removed when we remove BGL.
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader.cc')
-rw-r--r--source/blender/gpu/intern/gpu_shader.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_shader.cc b/source/blender/gpu/intern/gpu_shader.cc
index 49f96cb652c..827ea06686f 100644
--- a/source/blender/gpu/intern/gpu_shader.cc
+++ b/source/blender/gpu/intern/gpu_shader.cc
@@ -591,11 +591,10 @@ int GPU_shader_get_attribute(GPUShader *shader, const char *name)
/** \name Getters
* \{ */
-/* Clement : Temp */
-int GPU_shader_get_program(GPUShader *UNUSED(shader))
+/* DEPRECATED: Kept only because of BGL API */
+int GPU_shader_get_program(GPUShader *shader)
{
- /* TODO fixme */
- return (int)0;
+ return unwrap(shader)->program_handle_get();
}
/** \} */