Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1af7258c: Merge change 22695 into eclair

Browse Source 
Merge commit '1af7258c907f5ad148226d5dcbd188fd75facbfb' into eclair-plus-aosp

* commit '1af7258c907f5ad148226d5dcbd188fd75facbfb':
  Remove bogus comments and logging.
This commit is contained in:
Jason Sams
2009-08-25 17:13:16 -07:00
committed by Android Git Automerger
parent 7250f938ac 1af7258c90
commit e4f855a0aa
4 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/java/android/renderscript/RSSurfaceView.java
View File

@@ -71,7 +71,6 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
Log.v(RenderScript.LOG_TAG, "surfaceCreated"); Log.v(RenderScript.LOG_TAG, "surfaceCreated");
mSurfaceHolder = holder; mSurfaceHolder = holder;
//mGLThread.surfaceCreated();
} }
/** /**
@@ -81,7 +80,6 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
// Surface will be destroyed when we return // Surface will be destroyed when we return
Log.v(RenderScript.LOG_TAG, "surfaceDestroyed"); Log.v(RenderScript.LOG_TAG, "surfaceDestroyed");
//mGLThread.surfaceDestroyed();
} }
/** /**
@@ -90,8 +88,6 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
*/ */
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
Log.v(RenderScript.LOG_TAG, "surfaceChanged"); Log.v(RenderScript.LOG_TAG, "surfaceChanged");
//mGLThread.onWindowResize(w, h);
} }
/** /**
@@ -102,7 +98,6 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
*/ */
public void onPause() { public void onPause() {
Log.v(RenderScript.LOG_TAG, "onPause"); Log.v(RenderScript.LOG_TAG, "onPause");
//mGLThread.onPause();
} }
/** /**
@@ -114,7 +109,6 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
*/ */
public void onResume() { public void onResume() {
Log.v(RenderScript.LOG_TAG, "onResume"); Log.v(RenderScript.LOG_TAG, "onResume");
//mGLThread.onResume();
} }
/** /**
@@ -125,7 +119,6 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
*/ */
public void queueEvent(Runnable r) { public void queueEvent(Runnable r) {
Log.v(RenderScript.LOG_TAG, "queueEvent"); Log.v(RenderScript.LOG_TAG, "queueEvent");
//mGLThread.queueEvent(r);
} }
/** /**
@@ -136,7 +129,6 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback
@Override @Override
protected void onDetachedFromWindow() { protected void onDetachedFromWindow() {
super.onDetachedFromWindow(); super.onDetachedFromWindow();
//mGLThread.requestExitAndWait();
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------

1
libs/rs/java/Fountain/res/raw/fountain.c
View File

@@ -12,7 +12,6 @@ int main(int launchID) {
float height = getHeight(); float height = getHeight();
if (rate) { if (rate) {
debugI32("rate", rate);
int *dataI = loadArrayI32(1, 0); int *dataI = loadArrayI32(1, 0);
float rMax = ((float)rate) * 0.005f; float rMax = ((float)rate) * 0.005f;
int x = Control_x; int x = Control_x;

20
libs/rs/rsContext.cpp
View File

@@ -76,18 +76,17 @@ void Context::initEGL()
mGL.mRenderer = glGetString(GL_RENDERER); mGL.mRenderer = glGetString(GL_RENDERER);
mGL.mExtensions = glGetString(GL_EXTENSIONS); mGL.mExtensions = glGetString(GL_EXTENSIONS);
LOGV("EGL Version %i %i", mEGL.mMajorVersion, mEGL.mMinorVersion); //LOGV("EGL Version %i %i", mEGL.mMajorVersion, mEGL.mMinorVersion);
LOGV("GL Version %s", mGL.mVersion); //LOGV("GL Version %s", mGL.mVersion);
LOGV("GL Vendor %s", mGL.mVendor); //LOGV("GL Vendor %s", mGL.mVendor);
LOGV("GL Renderer %s", mGL.mRenderer); //LOGV("GL Renderer %s", mGL.mRenderer);
LOGV("GL Extensions %s", mGL.mExtensions); //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"); 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) bool Context::runScript(Script *s, uint32_t launchID)
@@ -115,7 +114,6 @@ bool Context::runRootScript()
//glColor4f(1,1,1,1); //glColor4f(1,1,1,1);
//glEnable(GL_LIGHT0); //glEnable(GL_LIGHT0);
glViewport(0, 0, mEGL.mWidth, mEGL.mHeight); glViewport(0, 0, mEGL.mWidth, mEGL.mHeight);
#if 1
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClearColor(mRootScript->mEnviroment.mClearColor[0], glClearColor(mRootScript->mEnviroment.mClearColor[0],
@@ -129,7 +127,7 @@ bool Context::runRootScript()
} else { } else {
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
} }
#endif
#if RS_LOG_TIMES #if RS_LOG_TIMES
timerSet(RS_TIMER_SCRIPT); timerSet(RS_TIMER_SCRIPT);
#endif #endif

4
libs/rs/rsScriptC.cpp
View File

@@ -267,7 +267,7 @@ void ScriptCState::appendTypes(String8 *str)
tmp.append(c->getComponentName()); tmp.append(c->getComponentName());
sprintf(buf, " %i\n", ct2); sprintf(buf, " %i\n", ct2);
tmp.append(buf); tmp.append(buf);
LOGD(tmp); //LOGD(tmp);
str->append(tmp); str->append(tmp);
} }
} }
@@ -295,7 +295,7 @@ void ScriptCState::appendTypes(String8 *str)
sprintf(buf, "%i, %i)\n", ct, ct2); sprintf(buf, "%i, %i)\n", ct, ct2);
tmp.append(buf); tmp.append(buf);
LOGD(tmp); //LOGD(tmp);
str->append(tmp); str->append(tmp);
} }
} }