History

Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.

Sam Gateau committed 11 years ago

Commit 7fc9fd91 parent cac239a15 files · +38 −38Browse files

Showing the changes to libraries/render-utils/src/TextRenderer3D.cpp (1 of 15 files). Show all

Unified · Split

libraries/render-utils/src/TextRenderer3D.cpp+1−1
@@ -423,7 +423,7 @@ void Font3D::drawString(gpu::Batch& batch, float x, float y, const QString& str, · 422 unmodified lines
423423
424424 setupGPU();
425425 batch.setPipeline(_pipeline);
426− batch.setUniformTexture(_fontLoc, _texture);
426+ batch.setResourceTexture(_fontLoc, _texture);
427427 batch._glUniform1i(_outlineLoc, (effectType == TextRenderer3D::OUTLINE_EFFECT));
428428 batch._glUniform4fv(_colorLoc, 1, (const GLfloat*)color);
429429