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 interface/src/ui/ApplicationOverlay.cpp (1 of 15 files). Show all

Unified · Split

interface/src/ui/ApplicationOverlay.cpp+1−1

@@ -196,7 +196,7 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder(RenderArgs* renderAr · 195 unmodified lines
196	geometryCache->useSimpleDrawPipeline(batch);	196	geometryCache->useSimpleDrawPipeline(batch);
197	batch.setProjectionTransform(mat4());	197	batch.setProjectionTransform(mat4());
198	batch.setModelTransform(mat4());	198	batch.setModelTransform(mat4());
199	batch.setUniformTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());	199	batch.setResourceTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());
200	batch._glLineWidth(CONNECTION_STATUS_BORDER_LINE_WIDTH);	200	batch._glLineWidth(CONNECTION_STATUS_BORDER_LINE_WIDTH);
201		201
202	// TODO animate the disconnect border for some excitement while not connected?	202	// TODO animate the disconnect border for some excitement while not connected?