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

Add correct line number to OpDebugFunction and OpDebugScope for function #3357

Merged
merged 1 commit into from
Oct 25, 2023

Conversation

chaocNV
Copy link
Contributor

@chaocNV chaocNV commented Oct 12, 2023

  1. Pull OpDebugFunction, OpDebugScope and OpDebugVariable for params out of makeFunctionEntry.
  2. Put above in a separate function called setupDebugFunctionEntry, which also accept line number and set it correctly in builder.
  3. Call setupDebugFunctionEntry in makeFunction. Also special case handle entry function since it's created ealier elsewhere.

@CLAassistant
Copy link

CLAassistant commented Oct 12, 2023

CLA assistant check
All committers have signed the CLA.

@chaocNV
Copy link
Contributor Author

chaocNV commented Oct 12, 2023

@arcady-lunarg @ncesario-lunarg Could you help review and if looks good, merge it?

Copy link
Collaborator

@ncesario-lunarg ncesario-lunarg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thinks looks good on the surface, but it would be good to get @jeremy-lunarg's input as I believe he was the original implementer of this (I think?).

Copy link
Contributor

@jeremy-lunarg jeremy-lunarg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple of spelling corrections but LGTM. Thanks!

SPIRV/SpvBuilder.cpp Outdated Show resolved Hide resolved
SPIRV/SpvBuilder.cpp Outdated Show resolved Hide resolved
@chaocNV chaocNV force-pushed the addLineForDebugFunction branch from 95cdcf5 to c5d52f8 Compare October 24, 2023 08:00
@chaocNV
Copy link
Contributor Author

chaocNV commented Oct 24, 2023

@ncesario-lunarg

All review comment resolved. Could you help merge if it looks good to you?

@ncesario-lunarg
Copy link
Collaborator

@chaocNV if you are able to run the tests, can you please take a look at this failing test: https://github.com/KhronosGroup/glslang/actions/runs/6623976670/job/17992038094?pr=3357#step:11:3400

It looks like the test result file just needs to be updated.

@chaocNV chaocNV force-pushed the addLineForDebugFunction branch from c5d52f8 to 7234b36 Compare October 24, 2023 17:54
…ion:

1. Pull OpDebugFunction, OpDebugScope and OpDebugVariable for params out
   of makeFunctionEntry.
2. Put above in a separate function called setupDebugFunctionEntry,
   which also accept line number and set it correctly in builder.
3. Call setupDebugFunctionEntry in makeFunction. Also special case
   handle entry function since it's created ealier elsewhere.
@chaocNV chaocNV force-pushed the addLineForDebugFunction branch from 7234b36 to 979423d Compare October 24, 2023 20:37
@chaocNV
Copy link
Contributor Author

chaocNV commented Oct 25, 2023

@chaocNV if you are able to run the tests, can you please take a look at this failing test: https://github.com/KhronosGroup/glslang/actions/runs/6623976670/job/17992038094?pr=3357#step:11:3400

It looks like the test result file just needs to be updated.

All fixed. Thanks for pointing out

@arcady-lunarg arcady-lunarg added the kokoro:run Trigger Google bot runs label Oct 25, 2023
@kokoro-team kokoro-team removed the kokoro:run Trigger Google bot runs label Oct 25, 2023
@ncesario-lunarg ncesario-lunarg merged commit e6fbb65 into KhronosGroup:main Oct 25, 2023
22 checks passed
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.

6 participants