Remove bogus comments and logging.
diff --git a/graphics/java/android/renderscript/RSSurfaceView.java b/graphics/java/android/renderscript/RSSurfaceView.java
index 792b98d..a3f1ded 100644
--- a/graphics/java/android/renderscript/RSSurfaceView.java
+++ b/graphics/java/android/renderscript/RSSurfaceView.java
@@ -71,7 +71,6 @@
public void surfaceCreated(SurfaceHolder holder) {
Log.v(RenderScript.LOG_TAG, "surfaceCreated");
mSurfaceHolder = holder;
- //mGLThread.surfaceCreated();
}
/**
@@ -81,7 +80,6 @@
public void surfaceDestroyed(SurfaceHolder holder) {
// Surface will be destroyed when we return
Log.v(RenderScript.LOG_TAG, "surfaceDestroyed");
- //mGLThread.surfaceDestroyed();
}
/**
@@ -90,8 +88,6 @@
*/
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
Log.v(RenderScript.LOG_TAG, "surfaceChanged");
-
- //mGLThread.onWindowResize(w, h);
}
/**
@@ -102,7 +98,6 @@
*/
public void onPause() {
Log.v(RenderScript.LOG_TAG, "onPause");
- //mGLThread.onPause();
}
/**
@@ -114,7 +109,6 @@
*/
public void onResume() {
Log.v(RenderScript.LOG_TAG, "onResume");
- //mGLThread.onResume();
}
/**
@@ -125,7 +119,6 @@
*/
public void queueEvent(Runnable r) {
Log.v(RenderScript.LOG_TAG, "queueEvent");
- //mGLThread.queueEvent(r);
}
/**
@@ -136,7 +129,6 @@
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
- //mGLThread.requestExitAndWait();
}
// ----------------------------------------------------------------------
diff --git a/libs/rs/java/Fountain/res/raw/fountain.c b/libs/rs/java/Fountain/res/raw/fountain.c
index e7804a5..8c1cad4 100644
--- a/libs/rs/java/Fountain/res/raw/fountain.c
+++ b/libs/rs/java/Fountain/res/raw/fountain.c
@@ -12,7 +12,6 @@
float height = getHeight();
if (rate) {
- debugI32("rate", rate);
int *dataI = loadArrayI32(1, 0);
float rMax = ((float)rate) * 0.005f;
int x = Control_x;
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 3ebfdce..52c2b78 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -76,18 +76,17 @@
mGL.mRenderer = glGetString(GL_RENDERER);
mGL.mExtensions = glGetString(GL_EXTENSIONS);
- LOGV("EGL Version %i %i", mEGL.mMajorVersion, mEGL.mMinorVersion);
- LOGV("GL Version %s", mGL.mVersion);
- LOGV("GL Vendor %s", mGL.mVendor);
- LOGV("GL Renderer %s", mGL.mRenderer);
- LOGV("GL Extensions %s", mGL.mExtensions);
+ //LOGV("EGL Version %i %i", mEGL.mMajorVersion, mEGL.mMinorVersion);
+ //LOGV("GL Version %s", mGL.mVersion);
+ //LOGV("GL Vendor %s", mGL.mVendor);
+ //LOGV("GL Renderer %s", mGL.mRenderer);
+ //LOGV("GL Extensions %s", mGL.mExtensions);
- if (memcmp(mGL.mVersion, "OpenGL ES-CM", 12)) {
+ if ((strlen((const char *)mGL.mVersion) < 12) || memcmp(mGL.mVersion, "OpenGL ES-CM", 12)) {
LOGE("Error, OpenGL ES Lite not supported");
+ } else {
+ sscanf((const char *)mGL.mVersion + 13, "%i.%i", &mGL.mMajorVersion, &mGL.mMinorVersion);
}
- sscanf((const char *)mGL.mVersion + 13, "%i.%i", &mGL.mMajorVersion, &mGL.mMinorVersion);
-
-
}
bool Context::runScript(Script *s, uint32_t launchID)
@@ -115,7 +114,6 @@
//glColor4f(1,1,1,1);
//glEnable(GL_LIGHT0);
glViewport(0, 0, mEGL.mWidth, mEGL.mHeight);
-#if 1
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClearColor(mRootScript->mEnviroment.mClearColor[0],
@@ -129,7 +127,7 @@
} else {
glClear(GL_COLOR_BUFFER_BIT);
}
-#endif
+
#if RS_LOG_TIMES
timerSet(RS_TIMER_SCRIPT);
#endif
diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp
index db4fd09..9419829 100644
--- a/libs/rs/rsScriptC.cpp
+++ b/libs/rs/rsScriptC.cpp
@@ -267,7 +267,7 @@
tmp.append(c->getComponentName());
sprintf(buf, " %i\n", ct2);
tmp.append(buf);
- LOGD(tmp);
+ //LOGD(tmp);
str->append(tmp);
}
}
@@ -295,7 +295,7 @@
sprintf(buf, "%i, %i)\n", ct, ct2);
tmp.append(buf);
- LOGD(tmp);
+ //LOGD(tmp);
str->append(tmp);
}
}
