diff options
| author | Jason Sams <rjsams@android.com> | 2010-07-09 15:34:32 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-07-09 15:34:32 -0700 |
| commit | 479e2924807e1fff79de2e0bee2a67939d8659ee (patch) | |
| tree | 33ab2f88d3b59f0acc8446c376cc137ae7e2cf5b /rsProgramVertex.cpp | |
| parent | c4cdf4586a0210a0e4b7b9bf38e8973b31d17ea1 (diff) | |
| download | android_frameworks_rs-479e2924807e1fff79de2e0bee2a67939d8659ee.tar.gz android_frameworks_rs-479e2924807e1fff79de2e0bee2a67939d8659ee.tar.bz2 android_frameworks_rs-479e2924807e1fff79de2e0bee2a67939d8659ee.zip | |
Remove points from fixed function.
Add basic GL performance test.
Change-Id: I421a41b6683b2c5f70045cdd0f610a6939105fee
Diffstat (limited to 'rsProgramVertex.cpp')
| -rw-r--r-- | rsProgramVertex.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/rsProgramVertex.cpp b/rsProgramVertex.cpp index 85d90c7c..55580070 100644 --- a/rsProgramVertex.cpp +++ b/rsProgramVertex.cpp @@ -191,7 +191,6 @@ void ProgramVertex::createShader() mShader.append("attribute vec4 ATTRIB_position;\n"); mShader.append("attribute vec4 ATTRIB_color;\n"); mShader.append("attribute vec3 ATTRIB_normal;\n"); - mShader.append("attribute float ATTRIB_pointSize;\n"); mShader.append("attribute vec4 ATTRIB_texture0;\n"); for (uint32_t ct=0; ct < mUniformCount; ct++) { @@ -202,7 +201,7 @@ void ProgramVertex::createShader() mShader.append("void main() {\n"); mShader.append(" gl_Position = UNI_MVP * ATTRIB_position;\n"); - mShader.append(" gl_PointSize = ATTRIB_pointSize;\n"); + mShader.append(" gl_PointSize = 1.0;\n"); mShader.append(" varColor = ATTRIB_color;\n"); if (mTextureMatrixEnable) { @@ -210,9 +209,6 @@ void ProgramVertex::createShader() } else { mShader.append(" varTex0 = ATTRIB_texture0;\n"); } - //mShader.append(" pos.x = pos.x / 480.0;\n"); - //mShader.append(" pos.y = pos.y / 800.0;\n"); - //mShader.append(" gl_Position = pos;\n"); mShader.append("}\n"); } } |