From bdff6cd85523d1a283e9230a36346b910ca601fa Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 20 Oct 2022 16:12:34 +0100 Subject: [PATCH] Delete orphaned file --- renderdoc/renderdoc.vcxproj | 1 - renderdoc/renderdoc.vcxproj.filters | 9 - .../serialise/codecs/vk_cpp_codec_common.h | 166 ------------------ 3 files changed, 176 deletions(-) delete mode 100644 renderdoc/serialise/codecs/vk_cpp_codec_common.h diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj index 8688bbb53..1ed616abf 100644 --- a/renderdoc/renderdoc.vcxproj +++ b/renderdoc/renderdoc.vcxproj @@ -246,7 +246,6 @@ - diff --git a/renderdoc/renderdoc.vcxproj.filters b/renderdoc/renderdoc.vcxproj.filters index 78323c672..666f949e4 100644 --- a/renderdoc/renderdoc.vcxproj.filters +++ b/renderdoc/renderdoc.vcxproj.filters @@ -127,12 +127,6 @@ {5994c355-880b-45b9-b17a-2e9e1fc2044a} - - {27f41754-8fa8-4a78-afb8-f63a32473540} - - - {ee6a7f7e-becf-43f0-8c7f-e0109a364ebb} - {b76c42f4-d523-4417-a474-56d278d35a36} @@ -468,9 +462,6 @@ Core - - Common\Serialise\Codecs\cpp_codec\vulkan - Resources\glsl diff --git a/renderdoc/serialise/codecs/vk_cpp_codec_common.h b/renderdoc/serialise/codecs/vk_cpp_codec_common.h deleted file mode 100644 index 32e5209c3..000000000 --- a/renderdoc/serialise/codecs/vk_cpp_codec_common.h +++ /dev/null @@ -1,166 +0,0 @@ -/****************************************************************************** - * The MIT License (MIT) - * - * Copyright (c) 2019-2022 Baldur Karlsson - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - ******************************************************************************/ - -#pragma once - -#include - -#include "serialise/rdcfile.h" - -namespace vk_cpp_codec -{ -inline const char *Type(SDObject *ptr) -{ - // (akharlamov) Moving this to filtering stage in TraceTracker class - // isn't trivial. Patching type.name, when done in Type() is only applied - // for SDObjects that store data structures, and patching them during filtering - // stage means the filter stage would need to touch on most of Vulkan API OR - // crawl through the entire SDObject list and patch every object ignoring Vulkan - // specifics. - - // Vulkan doesn't use string objects, so need to cast it to const char * - if(ptr->IsString() || ptr->type.name == "string") - return "const char* "; - - return ptr->type.name.c_str(); -} - -inline rdcstr ValueStr(SDObject *ptr) -{ - RDCASSERT(ptr->IsSimpleType()); - rdcstr result; - - if(ptr->IsBuffer()) - { - rdcstr buf_name = ptr->AsString(); - RDCASSERT(!buf_name.empty()); - // A value for for a Buffer is it's $name.data(). - result = buf_name + ".data()"; - // just-in-time fix for vkCreatShaderModule pCode variable - if(ptr->name == "pCode") - result = "(const uint32_t*) " + result; - } - else if(ptr->IsNULL()) - { - result = "NULL"; - } - else if(ptr->IsUInt()) - { - result = std::to_string(ptr->AsUInt64()) + "u"; - } - else if(ptr->IsInt()) - { - result = std::to_string(ptr->AsInt64()); - } - else if(ptr->IsFloat()) - { - if(RDCISNAN(ptr->data.basic.d)) - ptr->data.basic.d = 1.0f; - result = std::to_string(ptr->AsDouble()) + "f"; - } - else if(ptr->IsEnum()) - { - result = ptr->data.str; - } - else if(ptr->IsString()) - { - rdcstr escaped; - escaped.reserve(ptr->data.str.size()); - for(char c : ptr->data.str) - { - switch(c) - { - case '\a': escaped += "\\a"; break; - case '\b': escaped += "\\b"; break; - case '\f': escaped += "\\f"; break; - case '\n': escaped += "\\n"; break; - case '\r': escaped += "\\r"; break; - case '\t': escaped += "\\t"; break; - case '\v': escaped += "\\v"; break; - - case '"': - case '\\': - escaped.push_back('\\'); - escaped.push_back(c); - break; - - default: - if(c < 32 || c > 127) - { - char buf[8] = {}; - snprintf(buf, sizeof(buf), "\\x%02X", c); - escaped += buf; - } - else - { - escaped.push_back(c); - } - break; - } - } - result = "\"" + escaped + "\""; - } - return result; -} - -inline uint64_t CanonicalUnionBranch(SDObject *ptr) -{ - if(ptr->type.name == "VkClearValue") - { - return 0; // Use `color` - } - else if(ptr->type.name == "VkClearColorValue") - { - return 2; // Use `uint32` - } - // This function must be modified further to return the index of the canonical branch, which - // should be chosen so that it's size is equal to the size of the entire union, and so that the - // values can be represented exactly (e.g., not floating point). - RDCERR("Attempting to output an unknown union type %s", ptr->type.name.c_str()); - return 0; -} - -typedef rdcarray SDObjectVec; -typedef SDObject *SDObjectVecIter; - -typedef std::map SDObjectIDMap; -typedef SDObjectIDMap::iterator SDObjectIDMapIter; -typedef std::pair SDObjectIDMapPair; - -typedef std::map SDObjectVecIDMap; -typedef SDObjectVecIDMap::iterator SDObjectVecIDMapIter; -typedef std::pair SDObjectVecIDMapPair; - -typedef rdcarray SDChunkVec; -typedef SDChunk *SDChunkVecIter; - -typedef std::map SDChunkIDMap; -typedef SDChunkIDMap::iterator SDChunkIDMapIter; -typedef std::pair SDChunkIDMapPair; - -typedef std::map SDChunkVecIDMap; -typedef SDChunkVecIDMap::iterator SDChunkVecIDMapIter; -typedef std::pair SDChunkVecIDMapPair; - -} // namespace vk_cpp_codec