Beging GL2 user shaders. Switch master to using GL2 by default.
diff --git a/libs/rs/rsShaderCache.cpp b/libs/rs/rsShaderCache.cpp
index 2727e6c..4b16677 100644
--- a/libs/rs/rsShaderCache.cpp
+++ b/libs/rs/rsShaderCache.cpp
@@ -49,6 +49,7 @@
if (!frag->getShaderID()) {
frag->loadShader();
}
+ //LOGV("ShaderCache lookup vtx %i, frag %i", vtx->getShaderID(), frag->getShaderID());
for (uint32_t ct=0; ct < mEntryCount; ct++) {
if ((mEntries[ct].vtx == vtx->getShaderID()) &&
@@ -57,6 +58,7 @@
//LOGV("SC using program %i", mEntries[ct].program);
glUseProgram(mEntries[ct].program);
mCurrent = &mEntries[ct];
+ //LOGV("ShaderCache hit, using %i", ct);
return true;
}
}
@@ -75,8 +77,8 @@
mEntries = e;
}
- LOGV("vtx %i, frag %i", vtx->getShaderID(), frag->getShaderID());
- LOGE("e0 %x", glGetError());
+ //LOGV("ShaderCache miss, using %i", mEntryCount);
+ //LOGE("e0 %x", glGetError());
entry_t *e = &mEntries[mEntryCount];
mCurrent = e;
@@ -125,7 +127,7 @@
}
}
- LOGV("SC made program %i", e->program);
+ //LOGV("SC made program %i", e->program);
glUseProgram(e->program);
mEntryCount++;
return true;