History

Introduce an official syncCache on the GLBackend to catch up with the glCOntext ttrue state

Sam Gateau committed 11 years ago

Commit 3ec6ada1 parent 85fac835 files · +57 −12Browse files

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

Unified · Split

libraries/render-utils/src/Model.cpp+3−2
@@ -935,8 +935,8 @@ bool Model::renderCore(float alpha, RenderMode mode, RenderArgs* args) { · 934 unmodified lines
935 glPushMatrix();935 glPushMatrix();
936 #endif936 #endif
937 937
938 ::gpu::GLBackend::renderBatch(batch);938 ::gpu::GLBackend::renderBatch(batch, true); // force sync with gl state here
939 939
940 #if defined(ANDROID)940 #if defined(ANDROID)
941 #else941 #else
942 glPopMatrix();942 glPopMatrix();
@@ -1846,6 +1846,7 @@ void Model::endScene(RenderMode mode, RenderArgs* args) { · 903 unmodified lines
1846 }1846 }
1847 1847
1848 gpu::GLBackend backend;1848 gpu::GLBackend backend;
1849 backend.syncCache(); // force sync with gl state here
1849 1850
1850 if (args) {1851 if (args) {
1851 glm::mat4 proj;1852 glm::mat4 proj;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t