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

Track enabled caps in the renderstate only when not capframing

Browse Source
This commit is contained in:
Baldur Karlsson
2014-06-25 09:22:15 +01:00
parent dcf243ad63
commit 052694d39f
3 changed files with 130 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_renderstate.cpp
+89
View File
@@ -39,6 +39,44 @@ void GLRenderState::FetchState()
{
// TODO check GL_MAX_*
// TODO check the extensions/core version for these is around
{
GLenum pnames[eEnabled_Count] =
{
eGL_CLIP_DISTANCE0,
eGL_CLIP_DISTANCE1,
eGL_CLIP_DISTANCE2,
eGL_CLIP_DISTANCE3,
eGL_CLIP_DISTANCE4,
eGL_CLIP_DISTANCE5,
eGL_CLIP_DISTANCE6,
eGL_CLIP_DISTANCE7,
eGL_COLOR_LOGIC_OP,
eGL_CULL_FACE,
eGL_DEPTH_CLAMP,
eGL_DEPTH_TEST,
eGL_DITHER,
eGL_FRAMEBUFFER_SRGB,
eGL_LINE_SMOOTH,
eGL_MULTISAMPLE,
eGL_POLYGON_SMOOTH,
eGL_POLYGON_OFFSET_FILL,
eGL_POLYGON_OFFSET_LINE,
eGL_POLYGON_OFFSET_POINT,
eGL_PROGRAM_POINT_SIZE,
eGL_PRIMITIVE_RESTART,
eGL_SAMPLE_ALPHA_TO_COVERAGE,
eGL_SAMPLE_ALPHA_TO_ONE,
eGL_SAMPLE_COVERAGE,
eGL_SAMPLE_MASK,
eGL_SCISSOR_TEST,
eGL_STENCIL_TEST,
eGL_TEXTURE_CUBE_MAP_SEAMLESS,
};
for(GLuint i=0; i < eEnabled_Count; i++)
Enabled[i] = (m_Real->glIsEnabled(pnames[i]) == GL_TRUE);
}
m_Real->glGetIntegerv(eGL_ACTIVE_TEXTURE, (GLint *)&ActiveTexture);
@@ -90,6 +128,8 @@ void GLRenderState::FetchState()
m_Real->glGetIntegeri_v(eGL_BLEND_DST_RGB, i, (GLint*)&Blends[i].DestinationRGB);
m_Real->glGetIntegeri_v(eGL_BLEND_DST_ALPHA, i, (GLint*)&Blends[i].DestinationAlpha);
Blends[i].Enabled = (m_Real->glIsEnabledi(eGL_BLEND, i) == GL_TRUE);
}
m_Real->glGetFloatv(eGL_BLEND_COLOR, &BlendColor[0]);
@@ -168,6 +208,44 @@ void GLRenderState::FetchState()
void GLRenderState::ApplyState()
{
{
GLenum pnames[eEnabled_Count] =
{
eGL_CLIP_DISTANCE0,
eGL_CLIP_DISTANCE1,
eGL_CLIP_DISTANCE2,
eGL_CLIP_DISTANCE3,
eGL_CLIP_DISTANCE4,
eGL_CLIP_DISTANCE5,
eGL_CLIP_DISTANCE6,
eGL_CLIP_DISTANCE7,
eGL_COLOR_LOGIC_OP,
eGL_CULL_FACE,
eGL_DEPTH_CLAMP,
eGL_DEPTH_TEST,
eGL_DITHER,
eGL_FRAMEBUFFER_SRGB,
eGL_LINE_SMOOTH,
eGL_MULTISAMPLE,
eGL_POLYGON_SMOOTH,
eGL_POLYGON_OFFSET_FILL,
eGL_POLYGON_OFFSET_LINE,
eGL_POLYGON_OFFSET_POINT,
eGL_PROGRAM_POINT_SIZE,
eGL_PRIMITIVE_RESTART,
eGL_SAMPLE_ALPHA_TO_COVERAGE,
eGL_SAMPLE_ALPHA_TO_ONE,
eGL_SAMPLE_COVERAGE,
eGL_SAMPLE_MASK,
eGL_SCISSOR_TEST,
eGL_STENCIL_TEST,
eGL_TEXTURE_CUBE_MAP_SEAMLESS,
};
for(GLuint i=0; i < eEnabled_Count; i++)
if(Enabled[i]) m_Real->glEnable(pnames[i]); else m_Real->glDisable(pnames[i]);
}
for(size_t i=0; i < ARRAY_COUNT(Tex2D); i++)
{
m_Real->glActiveTexture(GLenum(eGL_TEXTURE0 + i));
@@ -210,6 +288,11 @@ void GLRenderState::ApplyState()
{
m_Real->glBlendFuncSeparatei(i, Blends[i].SourceRGB, Blends[i].DestinationRGB, Blends[i].DestinationRGB, Blends[i].DestinationAlpha);
m_Real->glBlendEquationSeparatei(i, Blends[i].EquationRGB, Blends[i].EquationAlpha);
if(Blends[i].Enabled)
m_Real->glEnablei(eGL_BLEND, i);
else
m_Real->glDisablei(eGL_BLEND, i);
}
m_Real->glBlendColor(BlendColor[0], BlendColor[1], BlendColor[2], BlendColor[3]);
@@ -293,6 +376,8 @@ void GLRenderState::ApplyState()
void GLRenderState::Clear()
{
RDCEraseEl(Enabled);
RDCEraseEl(Tex2D);
RDCEraseEl(ActiveTexture);
RDCEraseEl(BufferBindings);
@@ -327,6 +412,8 @@ void GLRenderState::Clear()
void GLRenderState::Serialise(LogState state, GLResourceManager *rm)
{
// TODO check GL_MAX_*
m_pSerialiser->Serialise<eEnabled_Count>("GL_ENABLED", Enabled);
for(size_t i=0; i < ARRAY_COUNT(Tex2D); i++)
{
@@ -378,6 +465,8 @@ void GLRenderState::Serialise(LogState state, GLResourceManager *rm)
m_pSerialiser->Serialise("GL_BLEND_DST_RGB", Blends[i].DestinationRGB);
m_pSerialiser->Serialise("GL_BLEND_DST_ALPHA", Blends[i].DestinationAlpha);
m_pSerialiser->Serialise("GL_BLEND", Blends[i].Enabled);
}
m_pSerialiser->Serialise<4>("GL_BLEND_COLOR", BlendColor);
renderdoc/driver/gl/gl_renderstate.h
+38
View File
@@ -38,6 +38,43 @@ struct GLRenderState
void ApplyState();
void Clear();
enum
{
// eEnabled_Blend // handled below with blend values
eEnabled_ClipDistance0,
eEnabled_ClipDistance1,
eEnabled_ClipDistance2,
eEnabled_ClipDistance3,
eEnabled_ClipDistance4,
eEnabled_ClipDistance5,
eEnabled_ClipDistance6,
eEnabled_ClipDistance7,
eEnabled_ColorLogicOp,
eEnabled_CullFace,
eEnabled_DepthClamp,
eEnabled_DepthTest,
eEnabled_Dither,
eEnabled_FramebufferSRGB,
eEnabled_LineSmooth,
eEnabled_Multisample,
eEnabled_PolySmooth,
eEnabled_PolyOffsetFill,
eEnabled_PolyOffsetLine,
eEnabled_PolyOffsetPoint,
eEnabled_ProgramPointSize,
eEnabled_PrimitiveRestart,
eEnabled_SampleAlphaToCoverage,
eEnabled_SampleAlphaToOne,
eEnabled_SampleCoverage,
eEnabled_SampleMask,
eEnabled_ScissorTest,
eEnabled_StencilTest,
eEnabled_TexCubeSeamless,
eEnabled_Count,
};
bool Enabled[eEnabled_Count];
//
uint32_t Tex2D[128];
GLenum ActiveTexture;
@@ -55,6 +92,7 @@ struct GLRenderState
GLenum EquationRGB, EquationAlpha;
GLenum SourceRGB, SourceAlpha;
GLenum DestinationRGB, DestinationAlpha;
bool Enabled;
} Blends[8];
float BlendColor[4];
renderdoc/driver/gl/wrappers/gl_state_funcs.cpp
+3 -35
View File
@@ -581,7 +581,7 @@ bool WrappedOpenGL::Serialise_glDisable(GLenum cap)
void WrappedOpenGL::glDisable(GLenum cap)
{
m_Real.glDisable(cap);
if(m_State == WRITING_CAPFRAME)
{
SCOPED_SERIALISE_CONTEXT(DISABLE);
@@ -589,14 +589,6 @@ void WrappedOpenGL::glDisable(GLenum cap)
m_ContextRecord->AddChunk(scope.Get());
}
// TODO replace this with glIsEnabled() for the relevant states
if(m_State == WRITING_IDLE)
{
SCOPED_SERIALISE_CONTEXT(DISABLE);
Serialise_glDisable(cap);
m_DeviceRecord->AddChunk(scope.Get());
}
}
bool WrappedOpenGL::Serialise_glEnable(GLenum cap)
@@ -622,14 +614,6 @@ void WrappedOpenGL::glEnable(GLenum cap)
m_ContextRecord->AddChunk(scope.Get());
}
// TODO replace this with glIsEnabled() for the relevant states
if(m_State == WRITING_IDLE)
{
SCOPED_SERIALISE_CONTEXT(ENABLE);
Serialise_glEnable(cap);
m_DeviceRecord->AddChunk(scope.Get());
}
}
bool WrappedOpenGL::Serialise_glDisablei(GLenum cap, GLuint index)
@@ -648,7 +632,7 @@ bool WrappedOpenGL::Serialise_glDisablei(GLenum cap, GLuint index)
void WrappedOpenGL::glDisablei(GLenum cap, GLuint index)
{
m_Real.glDisablei(cap, index);
if(m_State == WRITING_CAPFRAME)
{
SCOPED_SERIALISE_CONTEXT(DISABLEI);
@@ -656,14 +640,6 @@ void WrappedOpenGL::glDisablei(GLenum cap, GLuint index)
m_ContextRecord->AddChunk(scope.Get());
}
// TODO replace this with glIsEnabled() for the relevant states
if(m_State == WRITING_IDLE)
{
SCOPED_SERIALISE_CONTEXT(DISABLEI);
Serialise_glDisablei(cap, index);
m_DeviceRecord->AddChunk(scope.Get());
}
}
bool WrappedOpenGL::Serialise_glEnablei(GLenum cap, GLuint index)
@@ -682,7 +658,7 @@ bool WrappedOpenGL::Serialise_glEnablei(GLenum cap, GLuint index)
void WrappedOpenGL::glEnablei(GLenum cap, GLuint index)
{
m_Real.glEnablei(cap, index);
if(m_State == WRITING_CAPFRAME)
{
SCOPED_SERIALISE_CONTEXT(ENABLEI);
@@ -690,14 +666,6 @@ void WrappedOpenGL::glEnablei(GLenum cap, GLuint index)
m_ContextRecord->AddChunk(scope.Get());
}
// TODO replace this with glIsEnabled() for the relevant states
if(m_State == WRITING_IDLE)
{
SCOPED_SERIALISE_CONTEXT(ENABLEI);
Serialise_glEnablei(cap, index);
m_DeviceRecord->AddChunk(scope.Get());
}
}
bool WrappedOpenGL::Serialise_glFrontFace(GLenum mode)