From 2126dfd15b804cdbae5052fe15aeb1082469216a Mon Sep 17 00:00:00 2001 From: korenkonder Date: Wed, 26 Jun 2024 15:14:35 +0300 Subject: [PATCH] Removed `MOVIE` shader --- res/ft_shaders.farc | Bin 110144 -> 109248 bytes src/DivaGL/mdl/draw_object.cpp | 1 - src/DivaGL/shader_ft.cpp | 24 ------------------------ src/DivaGL/shader_ft.hpp | 1 - 4 files changed, 26 deletions(-) diff --git a/res/ft_shaders.farc b/res/ft_shaders.farc index fe0055a190d1cbcce34f451b8f01e58d59813216..c046b4e181e8ed2e9aaa62c924b92ce1b0bdc0e8 100644 GIT binary patch delta 2336 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 diff --git a/src/DivaGL/mdl/draw_object.cpp b/src/DivaGL/mdl/draw_object.cpp index 5453e80..0dee376 100644 --- a/src/DivaGL/mdl/draw_object.cpp +++ b/src/DivaGL/mdl/draw_object.cpp @@ -609,7 +609,6 @@ static bool draw_object_blend_set_check_use_default_blend(int32_t index) { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, - false, }; if (index >= 0 && index < SHADER_FT_MAX) diff --git a/src/DivaGL/shader_ft.cpp b/src/DivaGL/shader_ft.cpp index 6f91bdb..13fda6a 100644 --- a/src/DivaGL/shader_ft.cpp +++ b/src/DivaGL/shader_ft.cpp @@ -81,7 +81,6 @@ enum shader_ft_sub_enum { SHADER_FT_SUB_PARTICLE, SHADER_FT_SUB_GLITTER_PARTICLE, SHADER_FT_SUB_FONT, - SHADER_FT_SUB_MOVIE, SHADER_FT_SUB_BOX4, SHADER_FT_SUB_BOX8, SHADER_FT_SUB_COPY, @@ -633,14 +632,6 @@ static const int32_t font_fpt_unival_max[] = { -1, }; -static const int32_t movie_vpt_unival_max[] = { - 0, -}; - -static const int32_t movie_fpt_unival_max[] = { - 1, -}; - static const int32_t box4_vpt_unival_max[] = { -1, }; @@ -1295,16 +1286,6 @@ static const shader_sub_table FONT_table[] = { }, }; -static const shader_sub_table MOVIE_table[] = { - { - SHADER_FT_SUB_MOVIE, - movie_vpt_unival_max, - movie_fpt_unival_max, - "movie", - "movie", - }, -}; - static const shader_sub_table IMGFILT_table[] = { { SHADER_FT_SUB_BOX4, @@ -1539,10 +1520,6 @@ static const uniform_name FONT_uniform[] = { U_INVALID, }; -static const uniform_name MOVIE_uniform[] = { - U_MOVIE, -}; - static const uniform_name IMGFILT_uniform[] = { U_INVALID, }; @@ -1645,7 +1622,6 @@ const shader_table shader_ft_table[] = { shader_table_struct(PARTICL), shader_table_struct(GLITTER_PT), shader_table_struct(FONT), - shader_table_struct(MOVIE), shader_table_struct(IMGFILT), shader_table_struct(SPRITE), }; diff --git a/src/DivaGL/shader_ft.hpp b/src/DivaGL/shader_ft.hpp index dd6592e..53ddc00 100644 --- a/src/DivaGL/shader_ft.hpp +++ b/src/DivaGL/shader_ft.hpp @@ -54,7 +54,6 @@ enum shader_ft_enum { SHADER_FT_PARTICL, SHADER_FT_GLITTER_PT, SHADER_FT_FONT, - SHADER_FT_MOVIE, SHADER_FT_IMGFILT, SHADER_FT_SPRITE, SHADER_FT_END,