diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-05-01 22:12:59 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-05-01 22:12:59 +0300 |
| commit | fc872d738ef1526fd251f073c1a495344360a667 (patch) | |
| tree | 9f0676b1156f59e636500285502f7bb633d2693e /source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl | |
| parent | a330b9b0eac6ad1a71ee1cad974f673f26ec0cd3 (diff) | |
GPUShader: Port 2D widget shaders to use shaderCreateInfo
This should have no functional changes.
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl index 3a39cd8b847..c102b422211 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl @@ -1,24 +1,3 @@ -#ifndef USE_GPU_SHADER_CREATE_INFO -uniform mat4 ModelViewProjectionMatrix; - -# define MAX_PARAM 12 -# ifdef USE_INSTANCE -# define MAX_INSTANCE 6 -uniform vec4 parameters[MAX_PARAM * MAX_INSTANCE]; -# else -uniform vec4 parameters[MAX_PARAM]; -# endif -#endif - -/* gl_InstanceID is supposed to be 0 if not drawing instances, but this seems - * to be violated in some drivers. For example, macOS 10.15.4 and Intel Iris - * causes T78307 when using gl_InstanceID outside of instance. */ -#ifdef USE_INSTANCE -# define widgetID gl_InstanceID -#else -# define widgetID 0 -#endif - #define recti parameters[widgetID * MAX_PARAM + 0] #define rect parameters[widgetID * MAX_PARAM + 1] #define radsi parameters[widgetID * MAX_PARAM + 2].x @@ -42,22 +21,6 @@ uniform vec4 parameters[MAX_PARAM]; #define doAlphaCheck (alphaDiscard < 0.0) #define discardFactor abs(alphaDiscard) -#ifndef USE_GPU_SHADER_CREATE_INFO -noperspective out vec2 uvInterp; -flat out vec2 outRectSize; -flat out vec4 outRoundCorners; -noperspective out vec4 innerColor; -flat out vec4 borderColor; -flat out vec4 embossColor; -flat out float lineWidth; -noperspective out float butCo; -flat out float discardFac; - -# if defined(OS_MAC) && defined(GPU_OPENGL) -in float dummy; -# endif -#endif - vec2 do_widget(void) { /* Offset to avoid losing pixels (mimics conservative rasterization). */ |