Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2019-05-08 20:33:54 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-05-08 21:13:32 +0300
commit7e380fd46a6f5353eceaec383c40f20bf6c1551f (patch)
tree5d16028b66ff2886752f5515dd524625a648d48e /source/blender/draw/intern/draw_manager_exec.c
parent24aeb479be2b87d406196240c1a4c20e1688514e (diff)
GPU: Remove GPU_INVERSE_NORMAL_MATRIX
The end goal for this is to lower the number of needed matrices. This also cleanup some uneeded transformation.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_exec.c')
-rw-r--r--source/blender/draw/intern/draw_manager_exec.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 2c35d718f1f..f98c2cb1025 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -801,14 +801,11 @@ static void draw_matrices_model_prepare(DRWCallState *st)
if (st->matflag & DRW_CALL_MODELVIEWPROJECTION) {
mul_m4_m4m4(st->modelviewprojection, DST.view_data.matstate.mat[DRW_MAT_PERS], st->model);
}
- if (st->matflag & (DRW_CALL_NORMALVIEW | DRW_CALL_NORMALVIEWINVERSE)) {
+ if (st->matflag & (DRW_CALL_NORMALVIEW)) {
copy_m3_m4(st->normalview, st->modelview);
invert_m3(st->normalview);
transpose_m3(st->normalview);
}
- if (st->matflag & (DRW_CALL_NORMALVIEWINVERSE)) {
- invert_m3_m3(st->normalviewinverse, st->normalview);
- }
/* Non view dependent */
if (st->matflag & DRW_CALL_NORMALWORLD) {
copy_m3_m4(st->normalworld, st->model);
@@ -850,10 +847,6 @@ static void draw_geometry_prepare(DRWShadingGroup *shgroup, DRWCall *call)
GPU_shader_uniform_vector(
shgroup->shader, shgroup->normalview, 9, 1, (float *)state->normalview);
}
- if (shgroup->normalviewinverse != -1) {
- GPU_shader_uniform_vector(
- shgroup->shader, shgroup->normalviewinverse, 9, 1, (float *)state->normalviewinverse);
- }
if (shgroup->normalworld != -1) {
GPU_shader_uniform_vector(
shgroup->shader, shgroup->normalworld, 9, 1, (float *)state->normalworld);