lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename spv/ folder back to glsl/ (hope this will make better history)

Browse Source
This commit is contained in:
baldurk
2016-07-22 02:44:37 +02:00
parent ed512a48de
commit 7e5f51cbf8
33 changed files with 189 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/CMakeLists.txt
+21 -21
View File
@@ -193,27 +193,27 @@ target_compile_definitions(rdoc ${RDOC_DEFINITIONS})
target_include_directories(rdoc ${RDOC_INCLUDES})
set(data
data/spv/blit.vert
data/spv/checkerboard.frag
data/spv/debuguniforms.h
data/spv/fixedcol.frag
data/spv/histogram.comp
data/spv/mesh.comp
data/spv/mesh.frag
data/spv/mesh.geom
data/spv/mesh.vert
data/spv/minmaxresult.comp
data/spv/minmaxtile.comp
data/spv/outline.frag
data/spv/quadresolve.frag
data/spv/quadwrite.frag
data/spv/texdisplay.frag
data/spv/gl_texsample.h
data/spv/vk_texsample.h
data/spv/text.frag
data/spv/text.vert
data/spv/array2ms.comp
data/spv/ms2array.comp
data/glsl/blit.vert
data/glsl/checkerboard.frag
data/glsl/debuguniforms.h
data/glsl/fixedcol.frag
data/glsl/histogram.comp
data/glsl/mesh.comp
data/glsl/mesh.frag
data/glsl/mesh.geom
data/glsl/mesh.vert
data/glsl/minmaxresult.comp
data/glsl/minmaxtile.comp
data/glsl/outline.frag
data/glsl/quadresolve.frag
data/glsl/quadwrite.frag
data/glsl/texdisplay.frag
data/glsl/gl_texsample.h
data/glsl/vk_texsample.h
data/glsl/text.frag
data/glsl/text.vert
data/glsl/array2ms.comp
data/glsl/ms2array.comp
data/sourcecodepro.ttf)
set(data_objects)
renderdoc/data/embedded_files.h
+21 -21
View File
@@ -30,26 +30,26 @@
extern int CONCAT(CONCAT(data_, filename), _len);
DECLARE_EMBED(sourcecodepro_ttf);
DECLARE_EMBED(spv_blit_vert);
DECLARE_EMBED(spv_checkerboard_frag);
DECLARE_EMBED(spv_texdisplay_frag);
DECLARE_EMBED(spv_text_vert);
DECLARE_EMBED(spv_text_frag);
DECLARE_EMBED(spv_fixedcol_frag);
DECLARE_EMBED(spv_mesh_vert);
DECLARE_EMBED(spv_mesh_geom);
DECLARE_EMBED(spv_mesh_frag);
DECLARE_EMBED(spv_minmaxtile_comp);
DECLARE_EMBED(spv_minmaxresult_comp);
DECLARE_EMBED(spv_histogram_comp);
DECLARE_EMBED(spv_outline_frag);
DECLARE_EMBED(spv_debuguniforms_h);
DECLARE_EMBED(spv_gl_texsample_h);
DECLARE_EMBED(spv_vk_texsample_h);
DECLARE_EMBED(spv_quadresolve_frag);
DECLARE_EMBED(spv_quadwrite_frag);
DECLARE_EMBED(spv_mesh_comp);
DECLARE_EMBED(spv_array2ms_comp);
DECLARE_EMBED(spv_ms2array_comp);
DECLARE_EMBED(glsl_blit_vert);
DECLARE_EMBED(glsl_checkerboard_frag);
DECLARE_EMBED(glsl_texdisplay_frag);
DECLARE_EMBED(glsl_text_vert);
DECLARE_EMBED(glsl_text_frag);
DECLARE_EMBED(glsl_fixedcol_frag);
DECLARE_EMBED(glsl_mesh_vert);
DECLARE_EMBED(glsl_mesh_geom);
DECLARE_EMBED(glsl_mesh_frag);
DECLARE_EMBED(glsl_minmaxtile_comp);
DECLARE_EMBED(glsl_minmaxresult_comp);
DECLARE_EMBED(glsl_histogram_comp);
DECLARE_EMBED(glsl_outline_frag);
DECLARE_EMBED(glsl_debuguniforms_h);
DECLARE_EMBED(glsl_gl_texsample_h);
DECLARE_EMBED(glsl_vk_texsample_h);
DECLARE_EMBED(glsl_quadresolve_frag);
DECLARE_EMBED(glsl_quadwrite_frag);
DECLARE_EMBED(glsl_mesh_comp);
DECLARE_EMBED(glsl_array2ms_comp);
DECLARE_EMBED(glsl_ms2array_comp);
#undef DECLARE_EMBED
renderdoc/data/spv/array2ms.comp → renderdoc/data/glsl/array2ms.comp
View File
renderdoc/data/spv/blit.vert → renderdoc/data/glsl/blit.vert
View File
renderdoc/data/spv/checkerboard.frag → renderdoc/data/glsl/checkerboard.frag
View File
renderdoc/data/spv/debuguniforms.h → renderdoc/data/glsl/debuguniforms.h
View File
renderdoc/data/spv/fixedcol.frag → renderdoc/data/glsl/fixedcol.frag
-1
View File
@@ -2,7 +2,6 @@
* The MIT License (MIT)
*
* Copyright (c) 2015-2016 Baldur Karlsson
* Copyright (c) 2014 Crytek
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
renderdoc/data/spv/gl_texsample.h → renderdoc/data/glsl/gl_texsample.h
View File
renderdoc/data/spv/histogram.comp → renderdoc/data/glsl/histogram.comp
View File
renderdoc/data/spv/mesh.comp → renderdoc/data/glsl/mesh.comp
View File
renderdoc/data/spv/mesh.frag → renderdoc/data/glsl/mesh.frag
View File
renderdoc/data/spv/mesh.geom → renderdoc/data/glsl/mesh.geom
View File
renderdoc/data/spv/mesh.vert → renderdoc/data/glsl/mesh.vert
-1
View File
@@ -2,7 +2,6 @@
* The MIT License (MIT)
*
* Copyright (c) 2015-2016 Baldur Karlsson
* Copyright (c) 2014 Crytek
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
renderdoc/data/spv/minmaxresult.comp → renderdoc/data/glsl/minmaxresult.comp
View File
renderdoc/data/spv/minmaxtile.comp → renderdoc/data/glsl/minmaxtile.comp
View File
renderdoc/data/spv/ms2array.comp → renderdoc/data/glsl/ms2array.comp
View File
renderdoc/data/spv/outline.frag → renderdoc/data/glsl/outline.frag
-1
View File
@@ -2,7 +2,6 @@
* The MIT License (MIT)
*
* Copyright (c) 2015-2016 Baldur Karlsson
* Copyright (c) 2014 Crytek
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
renderdoc/data/spv/quadresolve.frag → renderdoc/data/glsl/quadresolve.frag
View File
renderdoc/data/spv/quadwrite.frag → renderdoc/data/glsl/quadwrite.frag
View File
renderdoc/data/spv/texdisplay.frag → renderdoc/data/glsl/texdisplay.frag
View File
renderdoc/data/spv/text.frag → renderdoc/data/glsl/text.frag
View File
renderdoc/data/spv/text.vert → renderdoc/data/glsl/text.vert
View File
renderdoc/data/spv/vk_texsample.h → renderdoc/data/glsl/vk_texsample.h
View File
renderdoc/data/glsl_shaders.cpp
+3 -3
View File
@@ -50,16 +50,16 @@ void GenerateGLSLShader(std::vector<std::string> &sources, ShaderType type,
sources[0] += "\n" + defines + "\n";
if(uniforms)
sources[1] = GetEmbeddedResource(spv_debuguniforms_h);
sources[1] = GetEmbeddedResource(glsl_debuguniforms_h);
else
sources[1] = "";
if(shader.find("#include \"texsample.h\"") != string::npos)
{
if(type == eShaderVulkan)
sources[2] = GetEmbeddedResource(spv_vk_texsample_h);
sources[2] = GetEmbeddedResource(glsl_vk_texsample_h);
else if(type == eShaderGLSL)
sources[2] = GetEmbeddedResource(spv_gl_texsample_h);
sources[2] = GetEmbeddedResource(glsl_gl_texsample_h);
else
RDCERR("Unknown type! %d", type);
}
renderdoc/data/renderdoc.rc
+21 -21
View File
@@ -112,27 +112,27 @@ RESOURCE_mesh_hlsl TYPE_EMBED "hlsl/mesh.hlsl"
RESOURCE_sourcecodepro_ttf TYPE_EMBED "sourcecodepro.ttf"
RESOURCE_spv_blit_vert TYPE_EMBED "spv/blit.vert"
RESOURCE_spv_checkerboard_frag TYPE_EMBED "spv/checkerboard.frag"
RESOURCE_spv_texdisplay_frag TYPE_EMBED "spv/texdisplay.frag"
RESOURCE_spv_text_vert TYPE_EMBED "spv/text.vert"
RESOURCE_spv_text_frag TYPE_EMBED "spv/text.frag"
RESOURCE_spv_fixedcol_frag TYPE_EMBED "spv/fixedcol.frag"
RESOURCE_spv_mesh_vert TYPE_EMBED "spv/mesh.vert"
RESOURCE_spv_mesh_geom TYPE_EMBED "spv/mesh.geom"
RESOURCE_spv_mesh_frag TYPE_EMBED "spv/mesh.frag"
RESOURCE_spv_minmaxtile_comp TYPE_EMBED "spv/minmaxtile.comp"
RESOURCE_spv_minmaxresult_comp TYPE_EMBED "spv/minmaxresult.comp"
RESOURCE_spv_histogram_comp TYPE_EMBED "spv/histogram.comp"
RESOURCE_spv_outline_frag TYPE_EMBED "spv/outline.frag"
RESOURCE_spv_debuguniforms_h TYPE_EMBED "spv/debuguniforms.h"
RESOURCE_spv_gl_texsample_h TYPE_EMBED "spv/gl_texsample.h"
RESOURCE_spv_vk_texsample_h TYPE_EMBED "spv/vk_texsample.h"
RESOURCE_spv_quadresolve_frag TYPE_EMBED "spv/quadresolve.frag"
RESOURCE_spv_quadwrite_frag TYPE_EMBED "spv/quadwrite.frag"
RESOURCE_spv_mesh_comp TYPE_EMBED "spv/mesh.comp"
RESOURCE_spv_array2ms_comp TYPE_EMBED "spv/array2ms.comp"
RESOURCE_spv_ms2array_comp TYPE_EMBED "spv/ms2array.comp"
RESOURCE_glsl_blit_vert TYPE_EMBED "glsl/blit.vert"
RESOURCE_glsl_checkerboard_frag TYPE_EMBED "glsl/checkerboard.frag"
RESOURCE_glsl_texdisplay_frag TYPE_EMBED "glsl/texdisplay.frag"
RESOURCE_glsl_text_vert TYPE_EMBED "glsl/text.vert"
RESOURCE_glsl_text_frag TYPE_EMBED "glsl/text.frag"
RESOURCE_glsl_fixedcol_frag TYPE_EMBED "glsl/fixedcol.frag"
RESOURCE_glsl_mesh_vert TYPE_EMBED "glsl/mesh.vert"
RESOURCE_glsl_mesh_geom TYPE_EMBED "glsl/mesh.geom"
RESOURCE_glsl_mesh_frag TYPE_EMBED "glsl/mesh.frag"
RESOURCE_glsl_minmaxtile_comp TYPE_EMBED "glsl/minmaxtile.comp"
RESOURCE_glsl_minmaxresult_comp TYPE_EMBED "glsl/minmaxresult.comp"
RESOURCE_glsl_histogram_comp TYPE_EMBED "glsl/histogram.comp"
RESOURCE_glsl_outline_frag TYPE_EMBED "glsl/outline.frag"
RESOURCE_glsl_debuguniforms_h TYPE_EMBED "glsl/debuguniforms.h"
RESOURCE_glsl_gl_texsample_h TYPE_EMBED "glsl/gl_texsample.h"
RESOURCE_glsl_vk_texsample_h TYPE_EMBED "glsl/vk_texsample.h"
RESOURCE_glsl_quadresolve_frag TYPE_EMBED "glsl/quadresolve.frag"
RESOURCE_glsl_quadwrite_frag TYPE_EMBED "glsl/quadwrite.frag"
RESOURCE_glsl_mesh_comp TYPE_EMBED "glsl/mesh.comp"
RESOURCE_glsl_array2ms_comp TYPE_EMBED "glsl/array2ms.comp"
RESOURCE_glsl_ms2array_comp TYPE_EMBED "glsl/ms2array.comp"
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
renderdoc/data/resource.h
+21 -21
View File
@@ -14,27 +14,27 @@
#define RESOURCE_sourcecodepro_ttf 301
#define RESOURCE_spv_blit_vert 401
#define RESOURCE_spv_checkerboard_frag 402
#define RESOURCE_spv_texdisplay_frag 403
#define RESOURCE_spv_text_vert 404
#define RESOURCE_spv_text_frag 405
#define RESOURCE_spv_fixedcol_frag 408
#define RESOURCE_spv_mesh_vert 409
#define RESOURCE_spv_mesh_geom 410
#define RESOURCE_spv_mesh_frag 411
#define RESOURCE_spv_minmaxtile_comp 412
#define RESOURCE_spv_minmaxresult_comp 413
#define RESOURCE_spv_histogram_comp 414
#define RESOURCE_spv_outline_frag 415
#define RESOURCE_spv_debuguniforms_h 416
#define RESOURCE_spv_gl_texsample_h 417
#define RESOURCE_spv_vk_texsample_h 418
#define RESOURCE_spv_quadresolve_frag 419
#define RESOURCE_spv_quadwrite_frag 420
#define RESOURCE_spv_mesh_comp 421
#define RESOURCE_spv_array2ms_comp 422
#define RESOURCE_spv_ms2array_comp 423
#define RESOURCE_glsl_blit_vert 401
#define RESOURCE_glsl_checkerboard_frag 402
#define RESOURCE_glsl_texdisplay_frag 403
#define RESOURCE_glsl_text_vert 404
#define RESOURCE_glsl_text_frag 405
#define RESOURCE_glsl_fixedcol_frag 408
#define RESOURCE_glsl_mesh_vert 409
#define RESOURCE_glsl_mesh_geom 410
#define RESOURCE_glsl_mesh_frag 411
#define RESOURCE_glsl_minmaxtile_comp 412
#define RESOURCE_glsl_minmaxresult_comp 413
#define RESOURCE_glsl_histogram_comp 414
#define RESOURCE_glsl_outline_frag 415
#define RESOURCE_glsl_debuguniforms_h 416
#define RESOURCE_glsl_gl_texsample_h 417
#define RESOURCE_glsl_vk_texsample_h 418
#define RESOURCE_glsl_quadresolve_frag 419
#define RESOURCE_glsl_quadwrite_frag 420
#define RESOURCE_glsl_mesh_comp 421
#define RESOURCE_glsl_array2ms_comp 422
#define RESOURCE_glsl_ms2array_comp 423
#if !defined(STRINGIZE)
#define STRINGIZE2(a) #a
renderdoc/driver/gl/gl_debug.cpp
+20 -19
View File
@@ -36,7 +36,7 @@
#include "gl_resources.h"
#define OPENGL 1
#include "data/spv/debuguniforms.h"
#include "data/glsl/debuguniforms.h"
GLuint GLReplay::CreateCShaderProgram(const vector<string> &csSources)
{
@@ -239,7 +239,7 @@ void GLReplay::InitDebugData()
vector<string> gs;
vector<string> cs;
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(spv_blit_vert), 420);
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(glsl_blit_vert), 420);
DebugData.texDisplayVSProg = CreateShaderProgram(vs, empty);
@@ -248,7 +248,7 @@ void GLReplay::InitDebugData()
string defines = string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
GenerateGLSLShader(fs, eShaderGLSL, defines, GetEmbeddedResource(spv_texdisplay_frag), 420);
GenerateGLSLShader(fs, eShaderGLSL, defines, GetEmbeddedResource(glsl_texdisplay_frag), 420);
DebugData.texDisplayProg[i] = CreateShaderProgram(empty, fs);
}
@@ -274,7 +274,7 @@ void GLReplay::InitDebugData()
DebugData.quadoverdraw420 = !support450;
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(spv_blit_vert), 420);
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(glsl_blit_vert), 420);
{
string defines = "";
@@ -287,26 +287,26 @@ void GLReplay::InitDebugData()
defines += "#define dFdyFine dFdy\n\n";
}
GenerateGLSLShader(fs, eShaderGLSL, defines, GetEmbeddedResource(spv_quadwrite_frag),
GenerateGLSLShader(fs, eShaderGLSL, defines, GetEmbeddedResource(glsl_quadwrite_frag),
support450 ? 450 : 420);
DebugData.quadoverdrawResolveProg = CreateShaderProgram(empty, fs);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(spv_quadresolve_frag), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(glsl_quadresolve_frag), 420);
DebugData.quadoverdrawResolveProg = CreateShaderProgram(vs, fs);
}
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(spv_checkerboard_frag), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(glsl_checkerboard_frag), 420);
DebugData.checkerProg = CreateShaderProgram(vs, fs);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(spv_fixedcol_frag), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(glsl_fixedcol_frag), 420);
DebugData.fixedcolFSProg = CreateShaderProgram(empty, fs);
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(spv_mesh_vert), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(spv_mesh_frag), 420);
GenerateGLSLShader(gs, eShaderGLSL, "", GetEmbeddedResource(spv_mesh_geom), 420);
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(glsl_mesh_vert), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(glsl_mesh_frag), 420);
GenerateGLSLShader(gs, eShaderGLSL, "", GetEmbeddedResource(glsl_mesh_geom), 420);
DebugData.meshProg = CreateShaderProgram(vs, fs);
DebugData.meshgsProg = CreateShaderProgram(vs, fs, gs);
@@ -399,7 +399,8 @@ void GLReplay::InitDebugData()
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
GenerateGLSLShader(cs, eShaderGLSL, defines, GetEmbeddedResource(spv_minmaxtile_comp), 420);
GenerateGLSLShader(cs, eShaderGLSL, defines, GetEmbeddedResource(glsl_minmaxtile_comp),
420);
DebugData.minmaxTileProgram[idx] = CreateCShaderProgram(cs);
}
@@ -410,7 +411,7 @@ void GLReplay::InitDebugData()
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
GenerateGLSLShader(cs, eShaderGLSL, defines, GetEmbeddedResource(spv_histogram_comp), 420);
GenerateGLSLShader(cs, eShaderGLSL, defines, GetEmbeddedResource(glsl_histogram_comp), 420);
DebugData.histogramProgram[idx] = CreateCShaderProgram(cs);
}
@@ -422,7 +423,7 @@ void GLReplay::InitDebugData()
defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n";
defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n";
GenerateGLSLShader(cs, eShaderGLSL, defines, GetEmbeddedResource(spv_minmaxresult_comp),
GenerateGLSLShader(cs, eShaderGLSL, defines, GetEmbeddedResource(glsl_minmaxresult_comp),
420);
DebugData.minmaxResultProgram[i] = CreateCShaderProgram(cs);
@@ -448,10 +449,10 @@ void GLReplay::InitDebugData()
}
{
GenerateGLSLShader(cs, eShaderGLSL, "", GetEmbeddedResource(spv_ms2array_comp), 420);
GenerateGLSLShader(cs, eShaderGLSL, "", GetEmbeddedResource(glsl_ms2array_comp), 420);
DebugData.MS2Array = CreateCShaderProgram(cs);
GenerateGLSLShader(cs, eShaderGLSL, "", GetEmbeddedResource(spv_array2ms_comp), 420);
GenerateGLSLShader(cs, eShaderGLSL, "", GetEmbeddedResource(glsl_array2ms_comp), 420);
DebugData.Array2MS = CreateCShaderProgram(cs);
}
@@ -459,7 +460,7 @@ void GLReplay::InitDebugData()
string defines =
"#extension GL_ARB_compute_shader : require\n"
"#extension GL_ARB_shader_storage_buffer_object : require";
GenerateGLSLShader(cs, eShaderGLSL, defines, GetEmbeddedResource(spv_mesh_comp), 420);
GenerateGLSLShader(cs, eShaderGLSL, defines, GetEmbeddedResource(glsl_mesh_comp), 420);
DebugData.meshPickProgram = CreateCShaderProgram(cs);
}
@@ -531,8 +532,8 @@ void GLReplay::InitDebugData()
gl.glVertexAttribPointer(0, 4, eGL_FLOAT, GL_FALSE, sizeof(Vec4f), NULL);
gl.glEnableVertexAttribArray(0);
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(spv_blit_vert), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(spv_outline_frag), 420);
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(glsl_blit_vert), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(glsl_outline_frag), 420);
DebugData.outlineQuadProg = CreateShaderProgram(vs, fs);
renderdoc/driver/gl/gl_driver.cpp
+3 -3
View File
@@ -35,7 +35,7 @@
#include "stb/stb_truetype.h"
#define OPENGL 1
#include "data/spv/debuguniforms.h"
#include "data/glsl/debuguniforms.h"
const int firstChar = int(' ') + 1;
const int lastChar = 127;
@@ -1173,8 +1173,8 @@ void WrappedOpenGL::ContextData::CreateDebugData(const GLHookSet &gl)
vector<string> vs;
vector<string> fs;
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(spv_text_vert), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(spv_text_frag), 420);
GenerateGLSLShader(vs, eShaderGLSL, "", GetEmbeddedResource(glsl_text_vert), 420);
GenerateGLSLShader(fs, eShaderGLSL, "", GetEmbeddedResource(glsl_text_frag), 420);
vector<const char *> vsc;
vsc.reserve(vs.size());
renderdoc/driver/gl/gl_replay.cpp
+1 -1
View File
@@ -29,7 +29,7 @@
#include "gl_resources.h"
#define OPENGL 1
#include "data/spv/debuguniforms.h"
#include "data/glsl/debuguniforms.h"
GLReplay::GLReplay()
{
renderdoc/driver/vulkan/vk_debug.cpp
+10 -10
View File
@@ -36,7 +36,7 @@
#include "vk_core.h"
#define VULKAN 1
#include "data/spv/debuguniforms.h"
#include "data/glsl/debuguniforms.h"
const VkDeviceSize STAGE_BUFFER_BYTE_SIZE = 16 * 1024 * 1024ULL;
@@ -719,7 +719,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
{
GenerateGLSLShader(
sources, eShaderVulkan, "",
i == 0 ? GetEmbeddedResource(spv_text_vert) : GetEmbeddedResource(spv_text_frag), 430);
i == 0 ? GetEmbeddedResource(glsl_text_vert) : GetEmbeddedResource(glsl_text_frag), 430);
vector<uint32_t> *spirv;
@@ -1316,13 +1316,13 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
RDCCOMPILE_ASSERT(sizeof(TexDisplayUBOData) <= 128, "tex display size");
string shaderSources[] = {
GetEmbeddedResource(spv_blit_vert), GetEmbeddedResource(spv_checkerboard_frag),
GetEmbeddedResource(spv_texdisplay_frag), GetEmbeddedResource(spv_mesh_vert),
GetEmbeddedResource(spv_mesh_geom), GetEmbeddedResource(spv_mesh_frag),
GetEmbeddedResource(spv_minmaxtile_comp), GetEmbeddedResource(spv_minmaxresult_comp),
GetEmbeddedResource(spv_histogram_comp), GetEmbeddedResource(spv_outline_frag),
GetEmbeddedResource(spv_quadresolve_frag), GetEmbeddedResource(spv_quadwrite_frag),
GetEmbeddedResource(spv_mesh_comp),
GetEmbeddedResource(glsl_blit_vert), GetEmbeddedResource(glsl_checkerboard_frag),
GetEmbeddedResource(glsl_texdisplay_frag), GetEmbeddedResource(glsl_mesh_vert),
GetEmbeddedResource(glsl_mesh_geom), GetEmbeddedResource(glsl_mesh_frag),
GetEmbeddedResource(glsl_minmaxtile_comp), GetEmbeddedResource(glsl_minmaxresult_comp),
GetEmbeddedResource(glsl_histogram_comp), GetEmbeddedResource(glsl_outline_frag),
GetEmbeddedResource(glsl_quadresolve_frag), GetEmbeddedResource(glsl_quadwrite_frag),
GetEmbeddedResource(glsl_mesh_comp),
};
SPIRVShaderStage shaderStages[] = {
@@ -1358,7 +1358,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev)
m_CacheShaders = true;
{
GenerateGLSLShader(sources, eShaderVulkan, "", GetEmbeddedResource(spv_fixedcol_frag), 430,
GenerateGLSLShader(sources, eShaderVulkan, "", GetEmbeddedResource(glsl_fixedcol_frag), 430,
false);
string err = GetSPIRVBlob(eSPIRVFragment, sources, &m_FixedColSPIRV);
renderdoc/driver/vulkan/vk_replay.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
#include "vk_resources.h"
#define VULKAN 1
#include "data/spv/debuguniforms.h"
#include "data/glsl/debuguniforms.h"
VulkanReplay::OutputWindow::OutputWindow() : wnd(NULL_WND_HANDLE), width(0), height(0)
{
renderdoc/renderdoc.vcxproj
+21 -21
View File
@@ -252,12 +252,12 @@
<ClInclude Include="core\resource_manager.h" />
<ClInclude Include="core\socket_helpers.h" />
<ClInclude Include="data\embedded_files.h" />
<ClInclude Include="data\glsl\debuguniforms.h" />
<ClInclude Include="data\glsl\gl_texsample.h" />
<ClInclude Include="data\glsl\vk_texsample.h" />
<ClInclude Include="data\glsl_shaders.h" />
<ClInclude Include="data\hlsl\debugcbuffers.h" />
<ClInclude Include="data\resource.h" />
<ClInclude Include="data\spv\debuguniforms.h" />
<ClInclude Include="data\spv\gl_texsample.h" />
<ClInclude Include="data\spv\vk_texsample.h" />
<ClInclude Include="data\version.h" />
<ClInclude Include="hooks\hooks.h" />
<ClInclude Include="maths\camera.h" />
@@ -378,30 +378,30 @@
<ResourceCompile Include="data\renderdoc.rc" />
</ItemGroup>
<ItemGroup>
<None Include="data\glsl\array2ms.comp" />
<None Include="data\glsl\blit.vert" />
<None Include="data\glsl\checkerboard.frag" />
<None Include="data\glsl\fixedcol.frag" />
<None Include="data\glsl\histogram.comp" />
<None Include="data\glsl\mesh.comp" />
<None Include="data\glsl\mesh.frag" />
<None Include="data\glsl\mesh.geom" />
<None Include="data\glsl\mesh.vert" />
<None Include="data\glsl\minmaxresult.comp" />
<None Include="data\glsl\minmaxtile.comp" />
<None Include="data\glsl\ms2array.comp" />
<None Include="data\glsl\outline.frag" />
<None Include="data\glsl\quadresolve.frag" />
<None Include="data\glsl\quadwrite.frag" />
<None Include="data\glsl\texdisplay.frag" />
<None Include="data\glsl\text.frag" />
<None Include="data\glsl\text.vert" />
<None Include="data\hlsl\debugcommon.hlsl" />
<None Include="data\hlsl\debugdisplay.hlsl" />
<None Include="data\hlsl\debugtext.hlsl" />
<None Include="data\hlsl\histogram.hlsl" />
<None Include="data\hlsl\mesh.hlsl" />
<None Include="data\hlsl\multisample.hlsl" />
<None Include="data\spv\array2ms.comp" />
<None Include="data\spv\blit.vert" />
<None Include="data\spv\checkerboard.frag" />
<None Include="data\spv\fixedcol.frag" />
<None Include="data\spv\histogram.comp" />
<None Include="data\spv\mesh.comp" />
<None Include="data\spv\mesh.frag" />
<None Include="data\spv\mesh.geom" />
<None Include="data\spv\mesh.vert" />
<None Include="data\spv\minmaxresult.comp" />
<None Include="data\spv\minmaxtile.comp" />
<None Include="data\spv\ms2array.comp" />
<None Include="data\spv\outline.frag" />
<None Include="data\spv\quadresolve.frag" />
<None Include="data\spv\quadwrite.frag" />
<None Include="data\spv\texdisplay.frag" />
<None Include="data\spv\text.frag" />
<None Include="data\spv\text.vert" />
<None Include="os\win32\comexport.def" />
</ItemGroup>
<ItemGroup>
renderdoc/renderdoc.vcxproj.filters
+46 -46
View File
@@ -64,9 +64,6 @@
<Filter Include="Hooks">
<UniqueIdentifier>{3e51a921-b167-4794-937d-e77573a928b8}</UniqueIdentifier>
</Filter>
<Filter Include="Resources\spv">
<UniqueIdentifier>{188ad934-e74f-4805-b74b-167f8760fab6}</UniqueIdentifier>
</Filter>
<Filter Include="OS\Posix">
<UniqueIdentifier>{410640a4-ebf0-479a-8d08-ae277e2ded84}</UniqueIdentifier>
</Filter>
@@ -79,6 +76,9 @@
<Filter Include="OS\Posix\Apple">
<UniqueIdentifier>{2d03f185-425a-4de5-8eeb-67dce5e56de9}</UniqueIdentifier>
</Filter>
<Filter Include="Resources\glsl">
<UniqueIdentifier>{188ad934-e74f-4805-b74b-167f8760fab6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="maths\camera.h">
@@ -225,9 +225,6 @@
<ClInclude Include="common\shader_cache.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="data\spv\debuguniforms.h">
<Filter>Resources\spv</Filter>
</ClInclude>
<ClInclude Include="common\custom_assert.h">
<Filter>Common</Filter>
</ClInclude>
@@ -243,11 +240,14 @@
<ClInclude Include="data\glsl_shaders.h">
<Filter>Resources</Filter>
</ClInclude>
<ClInclude Include="data\spv\gl_texsample.h">
<Filter>Resources\spv</Filter>
<ClInclude Include="data\glsl\debuguniforms.h">
<Filter>Resources\glsl</Filter>
</ClInclude>
<ClInclude Include="data\spv\vk_texsample.h">
<Filter>Resources\spv</Filter>
<ClInclude Include="data\glsl\gl_texsample.h">
<Filter>Resources\glsl</Filter>
</ClInclude>
<ClInclude Include="data\glsl\vk_texsample.h">
<Filter>Resources\glsl</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -439,59 +439,59 @@
<None Include="data\hlsl\mesh.hlsl">
<Filter>Resources\hlsl</Filter>
</None>
<None Include="data\spv\blit.vert">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\array2ms.comp">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\texdisplay.frag">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\blit.vert">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\checkerboard.frag">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\checkerboard.frag">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\text.frag">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\fixedcol.frag">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\text.vert">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\histogram.comp">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\fixedcol.frag">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\mesh.comp">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\mesh.comp">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\mesh.frag">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\mesh.frag">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\mesh.geom">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\mesh.geom">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\mesh.vert">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\mesh.vert">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\minmaxresult.comp">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\histogram.comp">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\minmaxtile.comp">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\minmaxresult.comp">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\ms2array.comp">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\minmaxtile.comp">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\outline.frag">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\outline.frag">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\quadresolve.frag">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\quadwrite.frag">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\quadwrite.frag">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\quadresolve.frag">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\texdisplay.frag">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\array2ms.comp">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\text.frag">
<Filter>Resources\glsl</Filter>
</None>
<None Include="data\spv\ms2array.comp">
<Filter>Resources\spv</Filter>
<None Include="data\glsl\text.vert">
<Filter>Resources\glsl</Filter>
</None>
</ItemGroup>
<ItemGroup>