From b31fc40fcd12a100fa52b5daa6a46ca6a58fadac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Mon, 22 Oct 2018 15:55:42 +0200 Subject: [PATCH] DRW: Fix missing uniform warning in debug mode Fix T57318 --- source/blender/draw/modes/overlay_mode.c | 4 ---- .../draw/modes/shaders/overlay_face_wireframe_vert.glsl | 1 - 2 files changed, 5 deletions(-) diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c index 3fa2f1d48e2..39bb062bc97 100644 --- a/source/blender/draw/modes/overlay_mode.c +++ b/source/blender/draw/modes/overlay_mode.c @@ -191,19 +191,15 @@ static void overlay_cache_init(void *vedata) psl->face_wireframe_full_pass = DRW_pass_create("All Face Wires", state); stl->g_data->sculpt_wires_full = DRW_shgroup_create(e_data.face_wireframe_sculpt_sh, psl->face_wireframe_full_pass); - DRW_shgroup_uniform_vec2(stl->g_data->sculpt_wires_full, "viewportSize", DRW_viewport_size_get(), 1); DRWShadingGroup *shgrp = DRW_shgroup_create(e_data.face_wireframe_sh, psl->face_wireframe_full_pass); - DRW_shgroup_uniform_vec2(shgrp, "viewportSize", DRW_viewport_size_get(), 1); psl->face_wireframe_pass = DRW_pass_create("Face Wires", state); stl->g_data->sculpt_wires = DRW_shgroup_create(e_data.face_wireframe_sculpt_pretty_sh, psl->face_wireframe_pass); - DRW_shgroup_uniform_vec2(stl->g_data->sculpt_wires, "viewportSize", DRW_viewport_size_get(), 1); DRW_shgroup_uniform_vec2(stl->g_data->sculpt_wires, "wireStepParam", stl->g_data->wire_step_param, 1); shgrp = DRW_shgroup_create(e_data.face_wireframe_pretty_sh, psl->face_wireframe_pass); - DRW_shgroup_uniform_vec2(shgrp, "viewportSize", DRW_viewport_size_get(), 1); DRW_shgroup_uniform_vec2(shgrp, "wireStepParam", stl->g_data->wire_step_param, 1); /** diff --git a/source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl b/source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl index b472ab43666..828bc551cad 100644 --- a/source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl +++ b/source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl @@ -5,7 +5,6 @@ uniform mat4 ProjectionMatrix; uniform mat3 NormalMatrix; uniform vec2 wireStepParam; -uniform vec2 viewportSize; uniform float nearDist; uniform samplerBuffer vertData;