Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vogleditor: add nested operations check #49

Merged
merged 2 commits into from
Apr 25, 2014

Conversation

lawlove
Copy link
Contributor

@lawlove lawlove commented Apr 24, 2014

A check is added at the "glEnd" entrypoint to ensure it doesn't get
moved past the parent frame in the case of an unpaired glEnd(). This
can inadvertently occur in a program and will cause a crash. (Similar
defect in apitrace)

Signed-off-by: Lawrence L Love lawrencex.l.love@intel.com

A check is added at the "glEnd" entrypoint to ensure it doesn't get
moved past the parent frame in the case of an unpaired glEnd(). This
can inadvertently occur in a program and will cause a crash. (Similar
defect in apitrace)

Signed-off-by: Lawrence L Love <lawrencex.l.love@intel.com>
Add glPush/PopDebugGroup as nesting delimiters along with existing
glBegin/End. Use same method as for other "vogl_is_xxx_entrypoint"
operations.

Comments:
If this glPush/PopDebugGroup addition is (and/or possibly others are)
accepted for nesting, another method would be to add a flag attribute
to packets to identify apicall types that can be logically AND'd rather
than using a switch statement (as done in apitrace).

Alternatively, create a "nest" object to encapsulate this information,
initializing it with a set of nested pairs (statically or via some
preference) and provide an interface(s) to return needed information.

Signed-off-by: Lawrence L Love <lawrencex.l.love@intel.com>
@lawlove
Copy link
Contributor Author

lawlove commented Apr 25, 2014

The first commit "add nested operations check" is a bug fix. The second "Add for additional nest operations" is a functional change. I put them in the same branch because the second commit includes the logic of the first but with modification. If it were a merge from a different branch, it would cause a merge conflict. Any preference given by the facilitator for this scenario is appreciated

mikesart pushed a commit that referenced this pull request Apr 25, 2014
vogleditor: add nested operations check
@mikesart mikesart merged commit dc914e1 into ValveSoftware:master Apr 25, 2014
@mikesart
Copy link
Contributor

Any preference given by the facilitator for this scenario is appreciated.

Seemed to work well here. Please let me know if you have suggestions for improving anything though. Thanks again Lawrence.

@PeterLValve
Copy link
Contributor

It looks like this change (in addition to my earlier similar change) breaks the timeline - the nested api calls no longer appear. The timeline will need to be enhanced to also visually support nested items.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants