From 0e8f8ea930d4b635fd7287f572dc2911996638bf Mon Sep 17 00:00:00 2001 From: iwubcode Date: Wed, 6 Sep 2023 00:16:26 -0500 Subject: VideoCommon: instead of using 'CustomTextureData' directly, use 'TextureData' for texture assets, this allows us to provide additional metadata for textures. Such as a sampler or type information (to distinguish cube maps) --- .../GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoCommon/GraphicsModSystem') diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp index 8f5225f142..267f88bb4c 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp @@ -423,7 +423,7 @@ void CustomPipelineAction::OnTextureCreate(GraphicsModActionData::TextureCreate* auto data = game_texture.m_asset->GetData(); if (data) { - if (data->m_slices.empty() || data->m_slices[0].m_levels.empty()) + if (data->m_texture.m_slices.empty() || data->m_texture.m_slices[0].m_levels.empty()) { ERROR_LOG_FMT( VIDEO, @@ -431,15 +431,16 @@ void CustomPipelineAction::OnTextureCreate(GraphicsModActionData::TextureCreate* create->texture_name, game_texture.m_asset->GetAssetId()); m_valid = false; } - else if (create->texture_width != data->m_slices[0].m_levels[0].width || - create->texture_height != data->m_slices[0].m_levels[0].height) + else if (create->texture_width != data->m_texture.m_slices[0].m_levels[0].width || + create->texture_height != data->m_texture.m_slices[0].m_levels[0].height) { ERROR_LOG_FMT(VIDEO, "Custom pipeline for texture '{}' has asset '{}' that does not match " "the width/height of the texture loaded. Texture {}x{} vs asset {}x{}", create->texture_name, game_texture.m_asset->GetAssetId(), create->texture_width, create->texture_height, - data->m_slices[0].m_levels[0].width, data->m_slices[0].m_levels[0].height); + data->m_texture.m_slices[0].m_levels[0].width, + data->m_texture.m_slices[0].m_levels[0].height); m_valid = false; } } -- cgit v1.2.3