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

Get initial sampler bindings

Browse Source
This commit is contained in:
baldurk
2014-08-15 12:20:18 +01:00
parent 0a83acef51
commit 7d52069401
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_renderstate.cpp
+11
View File
@@ -85,6 +85,7 @@ void GLRenderState::FetchState()
{
m_Real->glActiveTexture(GLenum(eGL_TEXTURE0 + i));
m_Real->glGetIntegerv(eGL_TEXTURE_BINDING_2D, (GLint*)&Tex2D[i]);
m_Real->glGetIntegerv(eGL_SAMPLER_BINDING, (GLint*)&Samplers[i]);
}
m_Real->glActiveTexture(ActiveTexture);
@@ -251,6 +252,7 @@ void GLRenderState::ApplyState()
{
m_Real->glActiveTexture(GLenum(eGL_TEXTURE0 + i));
m_Real->glBindTexture(eGL_TEXTURE_2D, Tex2D[i]);
m_Real->glBindSampler(i, Samplers[i]);
}
m_Real->glActiveTexture(ActiveTexture);
@@ -381,6 +383,7 @@ void GLRenderState::Clear()
RDCEraseEl(Enabled);
RDCEraseEl(Tex2D);
RDCEraseEl(Samplers);
RDCEraseEl(ActiveTexture);
RDCEraseEl(BufferBindings);
RDCEraseEl(AtomicCounter);
@@ -425,6 +428,14 @@ void GLRenderState::Serialise(LogState state, void *ctx, GLResourceManager *rm)
m_pSerialiser->Serialise("GL_TEXTURE_BINDING_2D", ID);
if(state < WRITING && ID != ResourceId()) Tex2D[i] = rm->GetLiveResource(ID).name;
}
for(size_t i=0; i < ARRAY_COUNT(Samplers); i++)
{
ResourceId ID = ResourceId();
if(state >= WRITING) ID = rm->GetID(SamplerRes(ctx, Samplers[i]));
m_pSerialiser->Serialise("GL_SAMPLER_BINDING", ID);
if(state < WRITING && ID != ResourceId()) Samplers[i] = rm->GetLiveResource(ID).name;
}
m_pSerialiser->Serialise("GL_ACTIVE_TEXTURE", ActiveTexture);
renderdoc/driver/gl/gl_renderstate.h
+2 -2
View File
@@ -77,6 +77,7 @@ struct GLRenderState
//
uint32_t Tex2D[128];
uint32_t Samplers[128];
GLenum ActiveTexture;
enum
@@ -123,9 +124,8 @@ struct GLRenderState
GLenum DrawBuffers[8];
// TODO:
// Sampler Bindings
// Framebuffer Bindings
// Program Bindings + Uniform Values
// Program Bindings
// Vertex Attribs/Buffers/Pointers etc
struct