Removes binding additional attribute for water shader added in 1d9a8b2b0b
.
Reported By: Freagarach This was SVN commit r26223.
This commit is contained in:
parent
a4a647e9f0
commit
40e75f9c89
@ -1370,7 +1370,7 @@ void CPatchRData::BuildWater()
|
||||
}
|
||||
}
|
||||
|
||||
void CPatchRData::RenderWaterSurface(CShaderProgramPtr& shader)
|
||||
void CPatchRData::RenderWaterSurface(CShaderProgramPtr& shader, const bool bindWaterData)
|
||||
{
|
||||
ASSERT(m_UpdateFlags == 0);
|
||||
|
||||
@ -1382,6 +1382,7 @@ void CPatchRData::RenderWaterSurface(CShaderProgramPtr& shader)
|
||||
// Setup data pointers.
|
||||
const GLsizei stride = sizeof(SWaterVertex);
|
||||
shader->VertexPointer(3, GL_FLOAT, stride, &base[m_VBWater->m_Index].m_Position);
|
||||
if (bindWaterData)
|
||||
shader->VertexAttribPointer(str_a_waterInfo, 2, GL_FLOAT, false, stride, &base[m_VBWater->m_Index].m_WaterData);
|
||||
|
||||
shader->AssertPointersBound();
|
||||
|
@ -47,7 +47,7 @@ public:
|
||||
void RenderOutline();
|
||||
void RenderPriorities(CTextRenderer& textRenderer);
|
||||
|
||||
void RenderWaterSurface(CShaderProgramPtr& shader);
|
||||
void RenderWaterSurface(CShaderProgramPtr& shader, const bool bindWaterData);
|
||||
void RenderWaterShore(CShaderProgramPtr& shader);
|
||||
|
||||
CPatch* GetPatch() { return m_Patch; }
|
||||
|
@ -486,7 +486,7 @@ bool TerrainRenderer::RenderFancyWater(const CShaderDefines& context, int cullGr
|
||||
for (size_t i = 0; i < visiblePatches.size(); ++i)
|
||||
{
|
||||
CPatchRData* data = visiblePatches[i];
|
||||
data->RenderWaterSurface(fancyWaterShader);
|
||||
data->RenderWaterSurface(fancyWaterShader, true);
|
||||
data->RenderWaterShore(fancyWaterShader);
|
||||
}
|
||||
m->fancyWaterTech->EndPass();
|
||||
@ -536,7 +536,7 @@ void TerrainRenderer::RenderSimpleWater(int cullGroup)
|
||||
for (size_t i = 0; i < visiblePatches.size(); ++i)
|
||||
{
|
||||
CPatchRData* data = visiblePatches[i];
|
||||
data->RenderWaterSurface(waterSimpleShader);
|
||||
data->RenderWaterSurface(waterSimpleShader, false);
|
||||
}
|
||||
|
||||
g_Renderer.BindTexture(1, 0);
|
||||
|
Loading…
Reference in New Issue
Block a user