Bugfix. glDisable with bad enum argument in GPU_texture_unbind
ClosedPublic
Actions

Authored by Alexander Romanov (a.romanov) on Aug 8 2016, 4:44 PM.

Details

Reviewers

Commits

rBS151390069a5b: Bugfix. glDisable with bad enum argument in GPU_texture_unbind
rB151390069a5b: Bugfix. glDisable with bad enum argument in GPU_texture_unbind

Summary

Reported by @Porteries Tristan (panzergame) in D1414.

glDisable calls with bad enum argument GL_TEXTURE_2D_MULTISAMPLE that came from this line:
tex->target = (n == 1) ? GL_TEXTURE_1D : (samples ? GL_TEXTURE_2D_MULTISAMPLE : GL_TEXTURE_2D);

Probably, similar changes should be done for glEnable. I'm not sure how to fix this correctly.

Reproduced this by pressing "OpenGL render active viewport" button.

Diff Detail

Event Timeline

Alexander Romanov (a.romanov) updated this revision to Diff 7204.Aug 8 2016, 4:44 PM

Alexander Romanov (a.romanov) retitled this revision from to Bugfix. glDisable with bad enum argument.

Alexander Romanov (a.romanov) updated this object.

Alexander Romanov (a.romanov) added a reviewer: Brecht Van Lommel (brecht).

Alexander Romanov (a.romanov) added a subscriber: Porteries Tristan (panzergame).

Porteries Tristan (panzergame) added inline comments.Aug 8 2016, 5:44 PM

source/blender/gpu/intern/gpu_texture.c
658	Isn't that similar to `target_base` ?

Alexander Romanov (a.romanov) added inline comments.Aug 8 2016, 5:54 PM

source/blender/gpu/intern/gpu_texture.c
658	`GLenum target_base; /* same as target, (but no multisample) */`

Porteries Tristan (panzergame) added inline comments.Aug 8 2016, 6:03 PM

source/blender/gpu/intern/gpu_texture.c
658	in this case we can leave only : glBindTexture(tex->target_base, 0); glDisable(tex->target_base); And use `target_base` too in `GPU_texture_bind`.

Brecht Van Lommel (brecht) added inline comments.Aug 9 2016, 1:28 AM

source/blender/gpu/intern/gpu_texture.c
658	I agree with @Porteries Tristan (panzergame), as far as I can tell we need only these two lines with target_base.

Alexander Romanov (a.romanov) updated this revision to Diff 7210.Aug 9 2016, 10:34 AM

I'm not a reviewer and i don't know if i can on this part, but for me the patch seems fine.

Brecht Van Lommel (brecht) accepted this revision.Aug 9 2016, 11:17 AM

Brecht Van Lommel (brecht) edited edge metadata.

Brecht Van Lommel (brecht) added inline comments.

source/blender/gpu/intern/gpu_texture.c
379	grammar nitpick: this values -> these values

This revision is now accepted and ready to land.Aug 9 2016, 11:17 AM

Grammar correction

Closed by commit rB151390069a5b: Bugfix. glDisable with bad enum argument in GPU_texture_unbind (authored by Alexander Romanov (a.romanov)). · Explain WhyAug 9 2016, 11:38 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

source/

blender/

gpu/

intern/

gpu_texture.c

16 lines

Diff 7211

View Options

source/blender/gpu/intern/gpu_texture.c

Bugfix. glDisable with bad enum argument in GPU_texture_unbindClosedPublicActions