diff options
| author | Romain Guy <romainguy@android.com> | 2009-09-04 17:55:41 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2009-09-04 17:55:53 -0700 |
| commit | 2d496bfebc010f26d65dd5e3a3c4a8170919cf0a (patch) | |
| tree | fc531aa4429fb1666bdf26d3abb00d8cbfedc033 /libs | |
| parent | e51ddc1b688fc6ecd57a1aa5cfdebbe1c22fc24d (diff) | |
| download | frameworks_base-2d496bfebc010f26d65dd5e3a3c4a8170919cf0a.zip frameworks_base-2d496bfebc010f26d65dd5e3a3c4a8170919cf0a.tar.gz frameworks_base-2d496bfebc010f26d65dd5e3a3c4a8170919cf0a.tar.bz2 | |
Fix point sprites.
Change-Id: Ic9438daaf25f3969a0dd5b634b7cceccbbbfb27b
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/rs/rsProgramFragment.cpp | 5 | ||||
| -rw-r--r-- | libs/rs/rsScriptC_Lib.cpp | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp index 0adce75..6cf64a4 100644 --- a/libs/rs/rsProgramFragment.cpp +++ b/libs/rs/rsProgramFragment.cpp @@ -56,6 +56,11 @@ void ProgramFragment::setupGL(const Context *rsc, ProgramFragmentState *state) glEnable(GL_TEXTURE_2D); if (rsc->checkVersion1_1()) { + if (mPointSpriteEnable) { + glEnable(GL_POINT_SPRITE_OES); + } else { + glDisable(GL_POINT_SPRITE_OES); + } glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, mPointSpriteEnable); } glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID()); diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp index 5b19f17..d10076b 100644 --- a/libs/rs/rsScriptC_Lib.cpp +++ b/libs/rs/rsScriptC_Lib.cpp @@ -800,6 +800,12 @@ static void SC_shininess(float s) glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, s); } +static void SC_pointAttenuation(float a, float b, float c) +{ + GLfloat params[] = { a, b, c }; + glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, params); +} + static void SC_hsbToRgb(float h, float s, float b, float* rgb) { float red = 0.0f; @@ -1185,6 +1191,8 @@ ScriptCState::SymbolTable_t ScriptCState::gSyms[] = { "void", "(float, float, float, float)" }, { "shininess", (void *)&SC_shininess, "void", "(float)" }, + { "pointAttenuation", (void *)&SC_pointAttenuation, + "void", "(float, float, float)" }, { "uploadToTexture", (void *)&SC_uploadToTexture, "void", "(int, int)" }, |