From 9f5a27c5be0a0f6a9f36360e618dcf5254ae689e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Fri, 7 Dec 2018 04:07:56 +0100 Subject: GPU: Remove EXT and add assert Some drivers accept shaders with only vertex stage, but some just silently fails. --- source/blender/gpu/intern/gpu_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/gpu/intern/gpu_shader.c') diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index bae7520803d..5aec6b17218 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -357,12 +357,15 @@ GPUShader *GPU_shader_create_ex( UNUSED_VARS(shname); #endif + /* At least a vertex shader and a fragment shader are required. */ + BLI_assert((fragcode != NULL) && (vertexcode != NULL)); + if (vertexcode) shader->vertex = glCreateShader(GL_VERTEX_SHADER); if (fragcode) shader->fragment = glCreateShader(GL_FRAGMENT_SHADER); if (geocode) - shader->geometry = glCreateShader(GL_GEOMETRY_SHADER_EXT); + shader->geometry = glCreateShader(GL_GEOMETRY_SHADER); shader->program = glCreateProgram(); -- cgit v1.2.3