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

8263486: Clean up MTLSurfaceDataBase.h #4010

Closed
wants to merge 3 commits into from

Conversation

aghaisas
Copy link
Contributor

@aghaisas aghaisas commented May 13, 2021

This PR addresses some cleanup activities :

  • Cleaned up MTLSurfaceDataBase.h & MTLSurfaceData.m
  • Removed OpenGL references from MTLPipelineStatesStorage.m & MTLRenderQueue.m

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4010/head:pull/4010
$ git checkout pull/4010

Update a local copy of the PR:
$ git checkout pull/4010
$ git pull https://git.openjdk.java.net/jdk pull/4010/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4010

View PR using the GUI difftool:
$ git pr show -t 4010

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4010.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 13, 2021

👋 Welcome back aghaisas! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label May 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 13, 2021

@aghaisas The following label will be automatically applied to this pull request:

  • 2d

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the 2d label May 13, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 13, 2021

Webrevs

* x/yOffset would be (0,0) (the same applies to pbuffers).
* jint x/yOffset;
* The offset in pixels of the viewport origin from the lower-left
* corner of the heavyweight drawable.
Copy link
Member

@mrserb mrserb May 20, 2021

Choose a reason for hiding this comment

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

Do we use these fields or they are always zero?

Copy link
Contributor Author

@aghaisas aghaisas May 21, 2021

Choose a reason for hiding this comment

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

Thanks for your review.
It turned out that - they are always zero. I will remove these fields.

extern jboolean MTLSD_InitMTLWindow(JNIEnv *env, BMTLSDOps *bmtlsdo);
extern void MTLSD_DestroyMTLSurface(JNIEnv *env, BMTLSDOps *bmtlsdo);

jboolean MTLSD_InitMTLWindow(JNIEnv *env, BMTLSDOps *bmtlsdo);
Copy link
Member

@mrserb mrserb May 20, 2021

Choose a reason for hiding this comment

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

How the MTLSD_WINDOW is used? Do we use it for the layer-based rendering?

Copy link
Contributor Author

@aghaisas aghaisas May 21, 2021

Choose a reason for hiding this comment

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

It is used in MTLContex.m. It just indicates a surface that we render to. We blit from this surface to the CAMetalLayer lateron.
It looks like MTLSD_WINDOW can be replaced with simple MTLSD_TEXTURE. This investigation and cleanup has already been identified during lanai code review (Bug - JDK-8263463)

mrserb
mrserb approved these changes May 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 21, 2021

@aghaisas This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8263486: Clean up MTLSurfaceDataBase.h

Reviewed-by: serb

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label May 21, 2021
@aghaisas
Copy link
Contributor Author

@aghaisas aghaisas commented May 22, 2021

/integrate

@openjdk openjdk bot closed this May 22, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 22, 2021

@aghaisas Since your change was applied there have been 2 commits pushed to the master branch:

  • fe33343: 8256304: should MonitorUsedDeflationThreshold be experimental or diagnostic
  • 8f10c5a: 8267190: Optimize Vector API test operations

Your commit was automatically rebased without conflicts.

Pushed as commit 72c9567.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2d integrated
2 participants