diff options
| author | 2016-01-19 21:21:33 +0000 | |
|---|---|---|
| committer | 2016-01-19 21:21:33 +0000 | |
| commit | 0c540849d7eb17c7e348821cd782afa99e3b7129 (patch) | |
| tree | 2fa894875bb9df5567176eae79bb90042fbd69c3 /libs/hwui/GradientCache.cpp | |
| parent | 6e415b691f066420dacc961dfb2fd176593f0135 (diff) | |
| parent | 9372ac3621848085e77b867f220c0b5ffce4010d (diff) | |
Merge "Fix ordering of texture->upload arguments"
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); |