use sized gl formats, fix memory error

This commit is contained in:
milek7
2018-07-19 20:46:45 +02:00
parent 7a76ee0100
commit e500d8c9f7
3 changed files with 37 additions and 38 deletions

View File

@@ -1954,7 +1954,6 @@ void opengl_renderer::Render(TSubModel *Submodel)
// specular strength in legacy models is set uniformly to 150, 150, 150 so we scale it down for opaque elements
}
model_ubs.emission = 0;
// ...luminance
if (Global.fLuminance < Submodel->fLight)
{
@@ -1967,6 +1966,8 @@ void opengl_renderer::Render(TSubModel *Submodel)
m_geometry.draw(Submodel->m_geometry);
model_ubs.emission = 0.0f;
#ifdef EU07_USE_OPTIMIZED_NORMALIZATION
switch (Submodel->m_normalizenormals)
{
@@ -2080,10 +2081,7 @@ void opengl_renderer::Render(TSubModel *Submodel)
m_geometry.draw(Submodel->m_geometry);
// post-draw reset
// re-enable shadows
/*
setup_shadow_color( m_shadowcolor );
*/
model_ubs.emission = 0.0f;
glDisable(GL_BLEND);
@@ -2792,7 +2790,6 @@ void opengl_renderer::Render_Alpha(TSubModel *Submodel)
}
// ...luminance
model_ubs.emission = 0.0f;
if (Global.fLuminance < Submodel->fLight)
{
model_ubs.emission = Submodel->f4Emision.a;
@@ -2803,6 +2800,8 @@ void opengl_renderer::Render_Alpha(TSubModel *Submodel)
model_ubo->update(model_ubs);
m_geometry.draw(Submodel->m_geometry);
model_ubs.emission = 0.0f;
#ifdef EU07_USE_OPTIMIZED_NORMALIZATION
switch (Submodel->m_normalizenormals)
{