diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-17 19:51:26 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-18 04:43:52 +0300 |
| commit | 35f1b3e43b37006486b94675466cf4260087e269 (patch) | |
| tree | 948195fd46b9e2165081e1ecf792ae63b1ab2319 /source/blender/editors | |
| parent | faeaf5325554e37981424ded5add7bf2df484c55 (diff) | |
Cleanup: GPU: Wrap GL_UNPACK_ROW_LENGTH in GPU_state
Also go back to default value of 0 after usage.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/screen/glutil.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 6b7ea447665..5c3b1944164 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -120,9 +120,6 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state, type = GL_UNSIGNED_BYTE; } - GLint unpack_row_length; - glGetIntegerv(GL_UNPACK_ROW_LENGTH, &unpack_row_length); - eGPUTextureFormat gpu_format = (type == GL_FLOAT) ? GPU_RGBA16F : GPU_RGBA8; eGPUDataFormat gpu_data = (type == GL_FLOAT) ? GPU_DATA_FLOAT : GPU_DATA_UNSIGNED_BYTE; GPUTexture *texture = GPU_texture_create_nD( @@ -165,7 +162,7 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state, immUniformColor4fv((color) ? color : white); } - glPixelStorei(GL_UNPACK_ROW_LENGTH, img_w); + GPU_unpack_row_length_set(img_w); for (subpart_y = 0; subpart_y < nsubparts_y; subpart_y++) { for (subpart_x = 0; subpart_x < nsubparts_x; subpart_x++) { @@ -259,7 +256,8 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state, GPU_texture_unbind(texture); GPU_texture_free(texture); - glPixelStorei(GL_UNPACK_ROW_LENGTH, unpack_row_length); + /* Restore default. */ + GPU_unpack_row_length_set(0); } void immDrawPixelsTexScaled(IMMDrawPixelsTexState *state, |