blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Draw Manager: Edit Mode Shader: Remove `#ifdef GPU_INTEL` 

The problem with memory alignment on Intel GPUs does not happen anymore after the last shader changes.
This commit is contained in:
Germano Cavalcante 2018-01-12 15:09:13 -02:00
parent 49d51a1e62
commit 5a293de925
4 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/draw/modes/shaders/edit_mesh_overlay_frag.glsl
View File

@ -14,6 +14,7 @@ uniform float faceAlphaMod;
flat in vec3 edgesCrease;
flat in vec3 edgesBweight;
flat in vec4 faceColor;
flat in ivec3 flag;
flat in int clipCase;
#ifdef VERTEX_SELECTION
in vec3 vertexColor;
@ -42,13 +43,6 @@ in float facing;
noperspective in vec2 eData1;
flat in vec2 eData2[3];
/* Some intel Gpu seems to have memory alignement problems. So adding a padding int */
#ifdef GPU_INTEL
flat in ivec4 flag;
#else
flat in ivec3 flag;
#endif
out vec4 FragColor;
#define EDGE_EXISTS (1 << 0)

8
source/blender/draw/modes/shaders/edit_mesh_overlay_geom_edge.glsl
View File

@ -23,6 +23,7 @@ in float vFacing[];
flat out vec3 edgesCrease;
flat out vec3 edgesBweight;
flat out vec4 faceColor;
flat out ivec3 flag;
flat out int clipCase;
#ifdef VERTEX_SELECTION
out vec3 vertexColor;
@ -31,13 +32,6 @@ out vec3 vertexColor;
out float facing;
#endif
/* Some intel Gpu seems to have memory alignement problems. So adding a padding int */
#ifdef GPU_INTEL
flat out ivec4 flag;
#else
flat out ivec3 flag;
#endif
/* See fragment shader */
noperspective out vec2 eData1;
flat out vec2 eData2[3];

8
source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl
View File

@ -42,6 +42,7 @@ in float vFacing[];
flat out vec3 edgesCrease;
flat out vec3 edgesBweight;
flat out vec4 faceColor;
flat out ivec3 flag;
flat out int clipCase;
#ifdef VERTEX_SELECTION
out vec3 vertexColor;
@ -54,13 +55,6 @@ out float facing;
noperspective out vec2 eData1;
flat out vec2 eData2[3];
/* Some intel Gpu seems to have memory alignement problems. So adding a padding int */
#ifdef GPU_INTEL
flat out ivec4 flag;
#else
flat out ivec3 flag;
#endif
#define VERTEX_ACTIVE (1 << 0)
#define VERTEX_SELECTED (1 << 1)

8
source/blender/draw/modes/shaders/edit_mesh_overlay_loosevert_vert.glsl
View File

@ -16,18 +16,12 @@ in ivec4 data;
flat out vec3 edgesCrease;
flat out vec3 edgesBweight;
flat out vec4 faceColor;
flat out ivec3 flag;
flat out int clipCase;
#ifdef VERTEX_SELECTION
out vec3 vertexColor;
#endif
/* Some intel Gpu seems to have memory alignement problems. So adding a padding int */
#ifdef GPU_INTEL
flat out ivec4 flag;
#else
flat out ivec3 flag;
#endif
/* See fragment shader */
noperspective out vec2 eData1;
flat out vec2 eData2[3];