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

Save GL_SAMPLE_SHADING, GL_RASTERIZER_DISCARD and all tex bindings

Browse Source 
* For every texture unit in GL, you can have one of each texture bound to
  it. So you can bind a 2d and a 3d to slot 5, and as long as you don't
  try to use both at once, you can use one in one shader, one in another,
  without needing to rebind. So the state vector we need to save includes
  every type of texture.
* I think, from checking against the spec tables, this should be the entire
  state vector saved now for core 4.5. There might still be some extension
  state not saved.
This commit is contained in:
baldurk
2015-01-17 13:05:04 +00:00
parent 772ee5ae3a
commit 760e18c242
3 changed files with 138 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_driver.h
+1 -1
View File
@@ -55,7 +55,7 @@ struct GLInitParams : public RDCInitParams
uint32_t width;
uint32_t height;
static const uint32_t GL_SERIALISE_VERSION = 0x0000004;
static const uint32_t GL_SERIALISE_VERSION = 0x0000005;
// version number internal to opengl stream
uint32_t SerialiseVersion;
renderdoc/driver/gl/gl_renderstate.cpp
+115 -9
View File
@@ -272,11 +272,13 @@ void GLRenderState::FetchState(void *ctx, WrappedOpenGL *gl)
eGL_SAMPLE_ALPHA_TO_ONE,
eGL_SAMPLE_COVERAGE,
eGL_SAMPLE_MASK,
eGL_SAMPLE_SHADING,
eGL_RASTER_MULTISAMPLE_EXT,
eGL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT,
eGL_STENCIL_TEST,
eGL_TEXTURE_CUBE_MAP_SEAMLESS,
eGL_BLEND_ADVANCED_COHERENT_KHR,
eGL_RASTERIZER_DISCARD,
};
RDCCOMPILE_ASSERT(ARRAY_COUNT(pnames) == eEnabled_Count, "Wrong number of pnames");
@@ -302,14 +304,36 @@ void GLRenderState::FetchState(void *ctx, WrappedOpenGL *gl)
m_Real->glGetIntegerv(eGL_ACTIVE_TEXTURE, (GLint *)&ActiveTexture);
// TODO fetch bindings for other types than 2D
for(GLuint i=0; i < (GLuint)ARRAY_COUNT(Tex2D); i++)
{
m_Real->glActiveTexture(GLenum(eGL_TEXTURE0 + i));
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_1D, (GLint*)&Tex1D[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_2D, (GLint*)&Tex2D[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_3D, (GLint*)&Tex3D[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_1D_ARRAY, (GLint*)&Tex1DArray[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_2D_ARRAY, (GLint*)&Tex2DArray[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_CUBE_MAP_ARRAY, (GLint*)&TexCubeArray[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_RECTANGLE, (GLint*)&TexRect[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_BUFFER, (GLint*)&TexBuffer[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_CUBE_MAP, (GLint*)&TexCube[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_2D_MULTISAMPLE, (GLint*)&Tex2DMS[i]);
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY, (GLint*)&Tex2DMSArray[i]);
m_Real->glGetIntegerv(eGL_SAMPLER_BINDING, (GLint*)&Samplers[i]);
}
for(GLuint i=0; i < (GLuint)ARRAY_COUNT(Images); i++)
{
GLboolean layered = GL_FALSE;
m_Real->glGetIntegerv(eGL_IMAGE_BINDING_NAME, (GLint*)&Images[i].name);
m_Real->glGetIntegerv(eGL_IMAGE_BINDING_LEVEL, (GLint*)&Images[i].level);
m_Real->glGetIntegerv(eGL_IMAGE_BINDING_ACCESS, (GLint*)&Images[i].access);
m_Real->glGetIntegerv(eGL_IMAGE_BINDING_FORMAT, (GLint*)&Images[i].format);
m_Real->glGetBooleanv(eGL_IMAGE_BINDING_LAYERED, &layered); Images[i].layered = (layered == GL_TRUE);
if(layered)
m_Real->glGetIntegerv(eGL_IMAGE_BINDING_LAYER, (GLint*)&Images[i].layer);
}
m_Real->glActiveTexture(ActiveTexture);
m_Real->glGetIntegerv(eGL_VERTEX_ARRAY_BINDING, (GLint *)&VAO);
@@ -572,11 +596,13 @@ void GLRenderState::ApplyState(void *ctx, WrappedOpenGL *gl)
eGL_SAMPLE_ALPHA_TO_ONE,
eGL_SAMPLE_COVERAGE,
eGL_SAMPLE_MASK,
eGL_SAMPLE_SHADING,
eGL_RASTER_MULTISAMPLE_EXT,
eGL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT,
eGL_STENCIL_TEST,
eGL_TEXTURE_CUBE_MAP_SEAMLESS,
eGL_BLEND_ADVANCED_COHERENT_KHR,
eGL_RASTERIZER_DISCARD,
};
RDCCOMPILE_ASSERT(ARRAY_COUNT(pnames) == eEnabled_Count, "Wrong number of pnames");
@@ -597,10 +623,28 @@ void GLRenderState::ApplyState(void *ctx, WrappedOpenGL *gl)
for(GLuint i=0; i < (GLuint)ARRAY_COUNT(Tex2D); i++)
{
m_Real->glActiveTexture(GLenum(eGL_TEXTURE0 + i));
m_Real->glBindTexture(eGL_TEXTURE_1D, Tex1D[i]);
m_Real->glBindTexture(eGL_TEXTURE_2D, Tex2D[i]);
m_Real->glBindTexture(eGL_TEXTURE_3D, Tex3D[i]);
m_Real->glBindTexture(eGL_TEXTURE_1D_ARRAY, Tex1DArray[i]);
m_Real->glBindTexture(eGL_TEXTURE_2D_ARRAY, Tex2DArray[i]);
m_Real->glBindTexture(eGL_TEXTURE_CUBE_MAP_ARRAY, TexCubeArray[i]);
m_Real->glBindTexture(eGL_TEXTURE_RECTANGLE, TexRect[i]);
m_Real->glBindTexture(eGL_TEXTURE_BUFFER, TexBuffer[i]);
m_Real->glBindTexture(eGL_TEXTURE_CUBE_MAP, TexCube[i]);
m_Real->glBindTexture(eGL_TEXTURE_2D_MULTISAMPLE, Tex2DMS[i]);
m_Real->glBindTexture(eGL_TEXTURE_2D_MULTISAMPLE_ARRAY, Tex2DMSArray[i]);
m_Real->glBindSampler(i, Samplers[i]);
}
for(GLuint i=0; i < (GLuint)ARRAY_COUNT(Images); i++)
{
m_Real->glBindImageTexture(i,
Images[i].name, (GLint)Images[i].level,
Images[i].layered, (GLint)Images[i].layer,
Images[i].access, Images[i].format);
}
m_Real->glActiveTexture(ActiveTexture);
m_Real->glBindVertexArray(VAO);
@@ -818,11 +862,23 @@ void GLRenderState::ApplyState(void *ctx, WrappedOpenGL *gl)
void GLRenderState::Clear()
{
RDCEraseEl(Enabled);
RDCEraseEl(Tex1D);
RDCEraseEl(Tex2D);
RDCEraseEl(Tex3D);
RDCEraseEl(Tex1DArray);
RDCEraseEl(Tex2DArray);
RDCEraseEl(TexCubeArray);
RDCEraseEl(TexRect);
RDCEraseEl(TexBuffer);
RDCEraseEl(TexCube);
RDCEraseEl(Tex2DMS);
RDCEraseEl(Tex2DMSArray);
RDCEraseEl(Samplers);
RDCEraseEl(ActiveTexture);
RDCEraseEl(Images);
RDCEraseEl(Program);
RDCEraseEl(Pipeline);
@@ -893,13 +949,50 @@ void GLRenderState::Serialise(LogState state, void *ctx, WrappedOpenGL *gl)
// TODO check GL_MAX_*
m_pSerialiser->Serialise<eEnabled_Count>("GL_ENABLED", Enabled);
for(size_t i=0; i < ARRAY_COUNT(Tex2D); i++)
ResourceId ids[128];
GLuint *texArrays[] = {
Tex1D,
Tex2D,
Tex3D,
Tex1DArray,
Tex2DArray,
TexCubeArray,
TexRect,
TexBuffer,
TexCube,
Tex2DMS,
Tex2DMSArray,
Samplers,
};
const char *names[] = {
"GL_TEXTURE_BINDING_1D",
"GL_TEXTURE_BINDING_2D",
"GL_TEXTURE_BINDING_3D",
"GL_TEXTURE_BINDING_1D_ARRAY",
"GL_TEXTURE_BINDING_2D_ARRAY",
"GL_TEXTURE_BINDING_CUBE_MAP_ARRAY",
"GL_TEXTURE_BINDING_RECTANGLE",
"GL_TEXTURE_BINDING_BUFFER",
"GL_TEXTURE_BINDING_CUBE_MAP",
"GL_TEXTURE_BINDING_2D_MULTISAMPLE",
"GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY",
};
for(int t=0; t < ARRAY_COUNT(texArrays); t++)
{
ResourceId ID = ResourceId();
if(state >= WRITING) ID = rm->GetID(TextureRes(ctx, Tex2D[i]));
m_pSerialiser->Serialise("GL_TEXTURE_BINDING_2D", ID);
if(state < WRITING && ID != ResourceId()) Tex2D[i] = rm->GetLiveResource(ID).name;
RDCEraseEl(ids);
if(state >= WRITING)
for(size_t i=0; i < ARRAY_COUNT(Tex2D); i++)
if(texArrays[t][i]) ids[i] = rm->GetID(TextureRes(ctx, texArrays[t][i]));
m_pSerialiser->Serialise<ARRAY_COUNT(Tex2D)>(names[t], ids);
if(state < WRITING)
for(size_t i=0; i < ARRAY_COUNT(Tex2D); i++)
if(ids[i] != ResourceId()) texArrays[t][i] = rm->GetLiveResource(ids[i]).name;
}
for(size_t i=0; i < ARRAY_COUNT(Samplers); i++)
@@ -909,7 +1002,20 @@ void GLRenderState::Serialise(LogState state, void *ctx, WrappedOpenGL *gl)
m_pSerialiser->Serialise("GL_SAMPLER_BINDING", ID);
if(state < WRITING && ID != ResourceId()) Samplers[i] = rm->GetLiveResource(ID).name;
}
for(size_t i=0; i < ARRAY_COUNT(Images); i++)
{
ResourceId ID = ResourceId();
if(state >= WRITING) ID = rm->GetID(TextureRes(ctx, Images[i].name));
m_pSerialiser->Serialise("GL_IMAGE_BINDING_NAME", ID);
m_pSerialiser->Serialise("GL_IMAGE_BINDING_LEVEL", Images[i].level);
m_pSerialiser->Serialise("GL_IMAGE_BINDING_LAYERED", Images[i].layered);
m_pSerialiser->Serialise("GL_IMAGE_BINDING_LAYER", Images[i].layer);
m_pSerialiser->Serialise("GL_IMAGE_BINDING_ACCESS", Images[i].access);
m_pSerialiser->Serialise("GL_IMAGE_BINDING_FORMAT", Images[i].format);
if(state < WRITING && ID != ResourceId()) Images[i].name = rm->GetLiveResource(ID).name;
}
m_pSerialiser->Serialise("GL_ACTIVE_TEXTURE", ActiveTexture);
{
renderdoc/driver/gl/gl_renderstate.h
+22 -6
View File
@@ -89,22 +89,43 @@ struct GLRenderState
eEnabled_SampleAlphaToOne,
eEnabled_SampleCoverage,
eEnabled_SampleMask,
eEnabled_SampleShading,
eEnabled_RasterMultisample,
eEnabled_RasterMultisampleFixed,
//eEnabled_ScissorTest, handled below with scissor values
eEnabled_StencilTest,
eEnabled_TexCubeSeamless,
eEnabled_BlendCoherent,
eEnabled_RasterizerDiscard,
eEnabled_Count,
};
bool Enabled[eEnabled_Count];
//
uint32_t Tex1D[128];
uint32_t Tex2D[128];
uint32_t Tex3D[128];
uint32_t Tex1DArray[128];
uint32_t Tex2DArray[128];
uint32_t TexCubeArray[128];
uint32_t TexRect[128];
uint32_t TexBuffer[128];
uint32_t TexCube[128];
uint32_t Tex2DMS[128];
uint32_t Tex2DMSArray[128];
uint32_t Samplers[128];
GLenum ActiveTexture;
struct
{
uint32_t name;
uint32_t level;
bool layered;
uint32_t layer;
GLenum access;
GLenum format;
} Images[8];
GLuint Program;
GLuint Pipeline;
@@ -177,11 +198,6 @@ struct GLRenderState
// Other FBOs serialise them in their resource records.
GLenum ReadBuffer;
GLenum DrawBuffers[8];
// TODO:
// Image state (GL_IMAGE_BINDING_NAME)
// multisampling
// other misc state :)
struct
{