diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h index 6d9e605c4b..b2b16d0bfe 100644 --- a/rpcs3/Emu/RSX/GL/GLHelpers.h +++ b/rpcs3/Emu/RSX/GL/GLHelpers.h @@ -55,16 +55,16 @@ namespace gl else\ gl##func##EXT(object_name, target, __VA_ARGS__); -#define DSA_CALL2(func, object_name, ...)\ +#define DSA_CALL2(func, ...)\ if (::gl::get_driver_caps().ARB_dsa_supported)\ - gl##func(object_name, __VA_ARGS__);\ + gl##func(__VA_ARGS__);\ else\ - gl##func##EXT(object_name, __VA_ARGS__); + gl##func##EXT(__VA_ARGS__); -#define DSA_CALL2_RET(func, object_name, ...)\ +#define DSA_CALL2_RET(func, ...)\ (::gl::get_driver_caps().ARB_dsa_supported) ?\ - gl##func(object_name, __VA_ARGS__) :\ - gl##func##EXT(object_name, __VA_ARGS__) + gl##func(__VA_ARGS__) :\ + gl##func##EXT(__VA_ARGS__) #define DSA_CALL3(funcARB, funcDSA, ...)\ if (::gl::get_driver_caps().ARB_dsa_supported)\ diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp index 16d2bf31bc..9a63db3539 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.cpp +++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp @@ -792,7 +792,7 @@ namespace gl else { // 2.1 Copy data to deswizzle buf - if (g_deswizzle_scratch_buffer.size() < image_linear_size) + if (g_deswizzle_scratch_buffer.size() < static_cast(image_linear_size)) { g_deswizzle_scratch_buffer.remove(); g_deswizzle_scratch_buffer.create(gl::buffer::target::ssbo, image_linear_size, nullptr, gl::buffer::memory_type::local);