kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #34492: clipping border not working with GLSL/matcap and Nouveau drivers.

Browse Source
This commit is contained in:
Brecht Van Lommel 2013-03-13 18:00:13 +00:00
parent 1d73ee50a4
commit 5ff0daf1ac
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/gpu/intern/gpu_extensions.c
View File

@ -1128,6 +1128,19 @@ static void shader_print_errors(const char *task, char *log, const char *code)
fprintf(stderr, "%s\n", log); fprintf(stderr, "%s\n", log);
} }
static const char *gpu_shader_standard_defines()
{
/* some useful defines to detect GPU type */
if(GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY))
return "#define GPU_ATI\n";
else if(GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_ANY, GPU_DRIVER_ANY))
return "#define GPU_NVIDIA\n";
else if(GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_ANY, GPU_DRIVER_ANY))
return "#define GPU_INTEL\n";
return "";
}
GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const char *libcode, const char *defines) GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const char *libcode, const char *defines)
{ {
GLint status; GLint status;
@ -1156,9 +1169,11 @@ GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const
} }
if (vertexcode) { if (vertexcode) {
const char *source[2]; const char *source[3];
int num_source = 0; int num_source = 0;
source[num_source++] = gpu_shader_standard_defines();
if (defines) source[num_source++] = defines; if (defines) source[num_source++] = defines;
if (vertexcode) source[num_source++] = vertexcode; if (vertexcode) source[num_source++] = vertexcode;
@ -1178,9 +1193,11 @@ GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const
} }
if (fragcode) { if (fragcode) {
const char *source[3]; const char *source[4];
int num_source = 0; int num_source = 0;
source[num_source++] = gpu_shader_standard_defines();
if (defines) source[num_source++] = defines; if (defines) source[num_source++] = defines;
if (libcode) source[num_source++] = libcode; if (libcode) source[num_source++] = libcode;
if (fragcode) source[num_source++] = fragcode; if (fragcode) source[num_source++] = fragcode;

8
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
View File

@ -29,11 +29,9 @@ void main()
gl_Position = gl_ProjectionMatrix * co; gl_Position = gl_ProjectionMatrix * co;
#ifdef __GLSL_CG_DATA_TYPES #ifdef GPU_NVIDIA
// Setting gl_ClipVertex is necessary to get glClipPlane working on NVIDIA graphic cards. // Setting gl_ClipVertex is necessary to get glClipPlane working on NVIDIA
// gl_ClipVertex works only on NVIDIA graphic cards so we have to check with // graphic cards, while on ATI it can cause a software fallback.
// __GLSL_CG_DATA_TYPES if a NVIDIA graphic card is used (Cg support).
// gl_ClipVerte is supported up to GLSL 1.20.
gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex; gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;
#endif #endif

8
source/blender/gpu/shaders/gpu_shader_vertex.glsl
View File

@ -10,11 +10,9 @@ void main()
varnormal = normalize(gl_NormalMatrix * gl_Normal); varnormal = normalize(gl_NormalMatrix * gl_Normal);
gl_Position = gl_ProjectionMatrix * co; gl_Position = gl_ProjectionMatrix * co;
// Setting gl_ClipVertex is necessary to get glClipPlane working on NVIDIA graphic cards. #ifdef GPU_NVIDIA
// gl_ClipVertex works only on NVIDIA graphic cards so we have to check with // Setting gl_ClipVertex is necessary to get glClipPlane working on NVIDIA
// __GLSL_CG_DATA_TYPES if a NVIDIA graphic card is used (Cg support). // graphic cards, while on ATI it can cause a software fallback.
// gl_ClipVerte is supported up to GLSL 1.20.
#ifdef __GLSL_CG_DATA_TYPES
gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex; gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;
#endif #endif