Page MenuHome
Differential D2361

blender 2.8: OpenGL immediate mode: area
ClosedPublic
Actions

Authored by Punya Biswal (punya) on Nov 16 2016, 3:40 PM.

Details

Reviewers
Mike Erwin (merwin)
Maniphest Tasks
T49043: replace OpenGL immediate mode in Blender 2.8
Summary

Starting work on area.c, divided up into several Git commits within this revision for my sanity. (Arc isn't working for me, for some reason, so I'm going to keep using git format-patch + copy-paste).

Broad question: this file resets the VertexFormat several times, and I'm worried that it'll be hard to see when a call to some utility function resets a vertex format when I'm not expecting it. Does this concern make sense, or does the library "take care of it" (like old-style glPushMatrix)? If it makes sense, is it worth creating a naming convention for functions that do or don't reset the vertex format?

Diff Detail

Repository
rB Blender

Event Timeline

Punya Biswal (punya) updated this revision to Diff 7817.Nov 16 2016, 3:40 PM
Punya Biswal (punya) retitled this revision from to blender 2.8: OpenGL immediate mode: area.
Punya Biswal (punya) updated this object.
Punya Biswal (punya) added a reviewer: Mike Erwin (merwin).
Punya Biswal (punya) set the repository for this revision to rB Blender.
Punya Biswal (punya) added a task: T49043: replace OpenGL immediate mode in Blender 2.8.
Punya Biswal (punya) mentioned this in T49043: replace OpenGL immediate mode in Blender 2.8.
Punya Biswal (punya) updated this revision to Diff 7818.Nov 16 2016, 3:42 PM

Forgot to unbind program last time!

Punya Biswal (punya) added a comment.Nov 16 2016, 3:48 PM

Wondering whether I should tackle interface_draw.c in a separate diff before converting the parts of this file that use UI_draw_roundbox_*.

Punya Biswal (punya) updated this revision to Diff 7821.Nov 16 2016, 4:06 PM
  • ED_region_panels
  • ED_region_do_draw
  • draw_azone_plus
Anthony Edlin (krash) added a subscriber: Anthony Edlin (krash).Nov 16 2016, 9:51 PM
Mike Erwin (merwin) edited edge metadata.Nov 16 2016, 10:50 PM

For your broader questions:
Gawain remembers as little as possible, there is no push/pop of vertex format. There *is* push/pop for matrices though!

Whenever possible, group related draws together so they can share vertex format, or even share a Begin/End pair. It's ok to rewrite or reorganize code to make this happen. As long as you test it :)

source/blender/editors/screen/area.c
227

The immUniformColor calls only work with UNIFORM_COLOR shaders. Use different shader here.

572

Use UNIFORM_COLOR shader here.

Punya Biswal (punya) updated this revision to Diff 7830.Nov 17 2016, 4:18 PM
Punya Biswal (punya) edited edge metadata.

Flat -> Uniform shader where applicable.

Punya Biswal (punya) marked 2 inline comments as done.Nov 17 2016, 4:19 PM

Caught and fixed a couple more instances of the same (copy-paste) mistake.

Mike Erwin (merwin) added a comment.Nov 17 2016, 7:57 PM

Looks good so far. All done with area.c?

The diffs look fine here, so whatever diff/patch workflow you are using is ok.

Anthony Edlin (krash) added inline comments.Nov 17 2016, 8:16 PM
source/blender/editors/screen/area.c
232

I'm not sure I understand why you replace fdrawline with imm_draw_line_box?

Mike Erwin (merwin) added inline comments.Nov 17 2016, 8:21 PM
source/blender/editors/screen/area.c
232

Good catch @Anthony Edlin (krash).

There is no replacement function for fdrawline, so expand these into

Begin(LINES, 4)
Vertex
Vertex
Vertex
Vertex
End
Punya Biswal (punya) updated this revision to Diff 7845.Nov 18 2016, 4:19 PM

Fixed accidental conversion of lines into rects.

Punya Biswal (punya) marked 2 inline comments as done.Nov 18 2016, 4:20 PM

Thanks for catching the accidental rect conversion.

Mike Erwin (merwin) accepted this revision.Dec 13 2016, 8:48 PM
Mike Erwin (merwin) edited edge metadata.
This revision is now accepted and ready to land.Dec 13 2016, 8:48 PM
Mike Erwin (merwin) mentioned this in rBfe5929636182: OpenGL: new immediate mode in area.c.Dec 13 2016, 8:53 PM
Mike Erwin (merwin) closed this revision.Dec 13 2016, 8:53 PM

committed in blender2.8

Revision Contents
Changeset List

PathSize
source/
blender/
editors/
screen/
86 lines

Diff 7845

View Options

source/blender/editors/screen/area.c

Loading...