From 6dfe32c6d2a76ca84da2a6125a755eebd2994a74 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Thu, 7 Dec 2017 15:40:20 +0300 Subject: [PATCH] fix linux builds --- rpcs3/Emu/RSX/Common/texture_cache.h | 6 +++--- rpcs3/Emu/RSX/GL/GLTexture.cpp | 2 +- rpcs3/Emu/RSX/GL/GLTexture.h | 2 +- rpcs3/Emu/RSX/GL/GLTextureCache.h | 6 +++--- rpcs3/Emu/RSX/VK/VKTextureCache.h | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index ef0e1419f1..dcf0790c01 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -302,11 +302,11 @@ namespace rsx virtual image_view_type create_temporary_subresource_view(commandbuffer_type&, image_resource_type* src, u32 gcm_format, u16 x, u16 y, u16 w, u16 h) = 0; virtual image_view_type create_temporary_subresource_view(commandbuffer_type&, image_storage_type* src, u32 gcm_format, u16 x, u16 y, u16 w, u16 h) = 0; virtual section_storage_type* create_new_texture(commandbuffer_type&, u32 rsx_address, u32 rsx_size, u16 width, u16 height, u16 depth, u16 mipmaps, const u32 gcm_format, - const rsx::texture_upload_context context, const rsx::texture_dimension_extended type, const texture_create_flags flags, std::pair, std::array>& remap_vector) = 0; + const rsx::texture_upload_context context, const rsx::texture_dimension_extended type, const texture_create_flags flags, const std::pair, std::array>& remap_vector) = 0; virtual section_storage_type* upload_image_from_cpu(commandbuffer_type&, u32 rsx_address, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, const u32 gcm_format, const texture_upload_context context, - std::vector& subresource_layout, const rsx::texture_dimension_extended type, const bool swizzled, std::pair, std::array>& remap_vector) = 0; + std::vector& subresource_layout, const rsx::texture_dimension_extended type, const bool swizzled, const std::pair, std::array>& remap_vector) = 0; virtual void enforce_surface_creation_type(section_storage_type& section, const u32 gcm_format, const texture_create_flags expected) = 0; - virtual void set_up_remap_vector(section_storage_type& section, std::pair, std::array>& remap_vector) = 0; + virtual void set_up_remap_vector(section_storage_type& section, const std::pair, std::array>& remap_vector) = 0; virtual void insert_texture_barrier() = 0; virtual image_view_type generate_cubemap_from_images(commandbuffer_type&, const u32 gcm_format, u16 size, std::array& sources) = 0; diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp index 0b53b01fd2..721c2b5bc8 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.cpp +++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp @@ -478,7 +478,7 @@ namespace gl } void upload_texture(const GLuint id, const u32 texaddr, const u32 gcm_format, u16 width, u16 height, u16 depth, u16 mipmaps, bool is_swizzled, rsx::texture_dimension_extended type, - std::vector& subresources_layout, std::pair, std::array>& decoded_remap, bool static_state) + std::vector& subresources_layout, const std::pair, std::array>& decoded_remap, bool static_state) { const bool is_cubemap = type == rsx::texture_dimension_extended::texture_dimension_cubemap; diff --git a/rpcs3/Emu/RSX/GL/GLTexture.h b/rpcs3/Emu/RSX/GL/GLTexture.h index e3cd12981b..34cdd78c58 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.h +++ b/rpcs3/Emu/RSX/GL/GLTexture.h @@ -27,7 +27,7 @@ namespace gl * static_state - set up the texture without consideration for sampler state (useful for vertex textures which have no real sampler state on RSX) */ void upload_texture(const GLuint id, const u32 texaddr, const u32 gcm_format, u16 width, u16 height, u16 depth, u16 mipmaps, bool is_swizzled, rsx::texture_dimension_extended type, - std::vector& subresources_layout, std::pair, std::array>& decoded_remap, bool static_state); + std::vector& subresources_layout, const std::pair, std::array>& decoded_remap, bool static_state); void apply_swizzle_remap(const GLenum target, const std::array& swizzle_remap, const std::pair, std::array>& decoded_remap); diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h index 4a5d38df92..05613ebaf4 100644 --- a/rpcs3/Emu/RSX/GL/GLTextureCache.h +++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h @@ -763,7 +763,7 @@ namespace gl cached_texture_section* create_new_texture(void*&, u32 rsx_address, u32 rsx_size, u16 width, u16 height, u16 depth, u16 mipmaps, const u32 gcm_format, const rsx::texture_upload_context context, const rsx::texture_dimension_extended type, const rsx::texture_create_flags flags, - std::pair, std::array>& /*remap_vector*/) override + const std::pair, std::array>& /*remap_vector*/) override { u32 vram_texture = gl::create_texture(gcm_format, width, height, depth, mipmaps, type); bool depth_flag = false; @@ -799,7 +799,7 @@ namespace gl cached_texture_section* upload_image_from_cpu(void*&, u32 rsx_address, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, const u32 gcm_format, const rsx::texture_upload_context context, std::vector& subresource_layout, const rsx::texture_dimension_extended type, const bool swizzled, - std::pair, std::array>& remap_vector) override + const std::pair, std::array>& remap_vector) override { void* unused = nullptr; auto section = create_new_texture(unused, rsx_address, pitch * height, width, height, depth, mipmaps, gcm_format, context, type, @@ -834,7 +834,7 @@ namespace gl section.set_sampler_status(rsx::texture_sampler_status::status_uninitialized); } - void set_up_remap_vector(cached_texture_section& section, std::pair, std::array>& remap_vector) override + void set_up_remap_vector(cached_texture_section& section, const std::pair, std::array>& remap_vector) override { std::array swizzle_remap; glBindTexture(GL_TEXTURE_2D, section.get_raw_texture()); diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index 8e42222ae9..7fadcb71e7 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -663,7 +663,7 @@ namespace vk cached_texture_section* create_new_texture(vk::command_buffer& cmd, u32 rsx_address, u32 rsx_size, u16 width, u16 height, u16 depth, u16 mipmaps, const u32 gcm_format, const rsx::texture_upload_context context, const rsx::texture_dimension_extended type, const rsx::texture_create_flags flags, - std::pair, std::array>& remap_vector) override + const std::pair, std::array>& remap_vector) override { const u16 section_depth = depth; const bool is_cubemap = type == rsx::texture_dimension_extended::texture_dimension_cubemap; @@ -753,7 +753,7 @@ namespace vk cached_texture_section* upload_image_from_cpu(vk::command_buffer& cmd, u32 rsx_address, u16 width, u16 height, u16 depth, u16 mipmaps, u16 pitch, const u32 gcm_format, const rsx::texture_upload_context context, std::vector& subresource_layout, const rsx::texture_dimension_extended type, const bool swizzled, - std::pair, std::array>& remap_vector) override + const std::pair, std::array>& remap_vector) override { auto section = create_new_texture(cmd, rsx_address, pitch * height, width, height, depth, mipmaps, gcm_format, context, type, rsx::texture_create_flags::default_component_order, remap_vector); @@ -822,7 +822,7 @@ namespace vk section.set_sampler_status(rsx::texture_sampler_status::status_uninitialized); } - void set_up_remap_vector(cached_texture_section& section, std::pair, std::array>& remap_vector) override + void set_up_remap_vector(cached_texture_section& section, const std::pair, std::array>& remap_vector) override { auto& view = section.get_view(); auto& original_remap = view->info.components;