diff options
| author | John Reck <jreck@google.com> | 2016-01-19 11:46:52 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2016-01-19 12:58:48 -0800 |
| commit | 9372ac3621848085e77b867f220c0b5ffce4010d (patch) | |
| tree | 2077130e6ffe97d3aa03ae8bb7a861aaa452fb85 /libs/hwui/GradientCache.cpp | |
| parent | 663d09ab4273f3e2c68bfaa72d4973f58e5cc023 (diff) | |
Fix ordering of texture->upload arguments
Caught by scatter-shotting GL_CHECKPOINTS which
seem generally useful to have
Bug: 26609444
Change-Id: Ie31d9297d8dae56405126720f338b4256c8bae77
Diffstat (limited to 'libs/hwui/GradientCache.cpp')
| -rw-r--r-- | libs/hwui/GradientCache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/GradientCache.cpp b/libs/hwui/GradientCache.cpp index 522aa96132dd..1473bc88c060 100644 --- a/libs/hwui/GradientCache.cpp +++ b/libs/hwui/GradientCache.cpp @@ -277,9 +277,9 @@ void GradientCache::generateTexture(uint32_t* colors, float* positions, if (mUseFloatTexture) { // We have to use GL_RGBA16F because GL_RGBA32F does not support filtering - texture->upload(width, height, GL_RGBA16F, GL_RGBA, GL_FLOAT, pixels); + texture->upload(GL_RGBA16F, width, height, GL_RGBA, GL_FLOAT, pixels); } else { - texture->upload(width, height, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, pixels); + texture->upload(GL_RGBA, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); } texture->setFilter(GL_LINEAR); |