Minor cleanup

This commit is contained in:
Henrik Rydgard 2017-03-19 18:00:57 +01:00
parent 1566ab9ac3
commit c502692490
3 changed files with 4 additions and 11 deletions

View File

@ -303,7 +303,7 @@ void GPU_D3D11::BeginHostFrame() {
if (resized_) {
drawEngine_.Resized();
textureCacheD3D11_->NotifyConfigChanged();
shaderManagerD3D11_->DirtyShader();
shaderManagerD3D11_->DirtyLastShader();
resized_ = false;
}
}
@ -337,7 +337,7 @@ void GPU_D3D11::BeginFrameInternal() {
} else if (dumpThisFrame_) {
dumpThisFrame_ = false;
}
shaderManagerD3D11_->DirtyShader();
shaderManagerD3D11_->DirtyLastShader();
framebufferManagerD3D11_->BeginFrame();
}

View File

@ -130,23 +130,17 @@ void ShaderManagerD3D11::Clear() {
void ShaderManagerD3D11::ClearShaders() {
Clear();
DirtyShader();
DirtyLastShader();
gstate_c.Dirty(DIRTY_ALL_UNIFORMS);
}
void ShaderManagerD3D11::DirtyShader() {
// Forget the last shader ID
void ShaderManagerD3D11::DirtyLastShader() {
lastFSID_.clear();
lastVSID_.clear();
lastVShader_ = nullptr;
lastFShader_ = nullptr;
}
void ShaderManagerD3D11::DirtyLastShader() { // disables vertex arrays
lastVShader_ = nullptr;
lastFShader_ = nullptr;
}
uint64_t ShaderManagerD3D11::UpdateUniforms() {
uint64_t dirty = gstate_c.GetDirtyUniforms();
if (dirty != 0) {

View File

@ -94,7 +94,6 @@ public:
void GetShaders(int prim, u32 vertType, D3D11VertexShader **vshader, D3D11FragmentShader **fshader, bool useHWTransform);
void ClearShaders();
void DirtyShader();
void DirtyLastShader() override;
int GetNumVertexShaders() const { return (int)vsCache_.size(); }