From e14fcd4f36572d5fc2ed32a778872a73ade7c30f Mon Sep 17 00:00:00 2001 From: korenkonder Date: Tue, 14 Mar 2023 12:39:08 +0300 Subject: [PATCH] Some additional fixes --- src/CRE/auth_3d.cpp | 2 +- src/CRE/render_context.cpp | 2 +- src/CRE/render_manager.cpp | 4 ++-- src/CRE/texture.cpp | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/CRE/auth_3d.cpp b/src/CRE/auth_3d.cpp index ff91f750..b1b6b5b9 100644 --- a/src/CRE/auth_3d.cpp +++ b/src/CRE/auth_3d.cpp @@ -108,7 +108,7 @@ static void auth_3d_curve_load(auth_3d* auth, auth_3d_curve* c, auth_3d_curve_fi static void auth_3d_dof_load(auth_3d* auth, auth_3d_dof* d, auth_3d_dof_file* df); static void auth_3d_dof_restore_prev_value(auth_3d_dof* d, render_context* rctx); static void auth_3d_dof_set(auth_3d_dof* d, render_context* rctx); -static auth_3d_detail::Event* auth_3d_event_load(auth_3d * auth, auth_3d_event_file * ef); +static auth_3d_detail::Event* auth_3d_event_load(auth_3d* auth, auth_3d_event_file* ef); static const char* auth_3d_event_type_string(auth_3d_detail::Event::Type type); static void auth_3d_fog_load(auth_3d* auth, auth_3d_fog* e, auth_3d_fog_file* ff); static void auth_3d_fog_restore_prev_value(auth_3d_fog* f, render_context* rctx); diff --git a/src/CRE/render_context.cpp b/src/CRE/render_context.cpp index f005be5e..654eebf8 100644 --- a/src/CRE/render_context.cpp +++ b/src/CRE/render_context.cpp @@ -2689,7 +2689,7 @@ void render_context::light_param_data_glow_set(light_param_glow* glow) { } void render_context::light_param_data_ibl_set( - light_param_ibl * ibl, light_param_data_storage* storage) { + light_param_ibl* ibl, light_param_data_storage* storage) { if (!ibl->ready) return; diff --git a/src/CRE/render_manager.cpp b/src/CRE/render_manager.cpp index 3b8c4d5b..df93058e 100644 --- a/src/CRE/render_manager.cpp +++ b/src/CRE/render_manager.cpp @@ -220,9 +220,9 @@ namespace rndr { draw_pass_shadow_begin_make_shadowmap(rctx, shad, v11[i], j); rctx->disp_manager.draw((mdl::ObjType)(mdl::OBJ_TYPE_SHADOW_CHARA + v11[i])); if (rctx->disp_manager.get_obj_count((mdl::ObjType)(mdl::OBJ_TYPE_SHADOW_OBJECT_CHARA + v11[i])) > 0) { - glColorMask(field_2F8 ? GL_TRUE : GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); + gl_state_set_color_mask(field_2F8 ? GL_TRUE : GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); rctx->disp_manager.draw((mdl::ObjType)(mdl::OBJ_TYPE_SHADOW_OBJECT_CHARA + i)); - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + gl_state_set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } draw_pass_shadow_end_make_shadowmap(rctx, shad, v11[i], j); j++; diff --git a/src/CRE/texture.cpp b/src/CRE/texture.cpp index 2e5bd8c2..18358a3b 100644 --- a/src/CRE/texture.cpp +++ b/src/CRE/texture.cpp @@ -109,6 +109,7 @@ texture* texture_copy(texture_id id, texture* org_tex) { void* data = force_malloc(texture_get_size_mip_level(org_tex, i)); if (!data) break; + if (org_tex->flags & TEXTURE_BLOCK_COMPRESSION) { glBindTexture(org_tex->target, org_tex->tex); glGetCompressedTexImage(org_tex->target, i, data);