Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Update Wireframe Shader to new MRTK standard #254

Merged
merged 7 commits into from
Jul 30, 2019

Conversation

SimonDarksideJ
Copy link
Contributor

XRTK - Mixed Reality Toolkit Change Request

Overview

Update Wireframe Shader to new MRTK standard

Target of the change:

Is this enhancement for:

  • Core (core framework, interfaces and definitions)

Changes:

Resolves #189

Breaking Changes:

Requires SDK update, to update materials to new shader

Copy link
Contributor

@StephenHodgson StephenHodgson left a comment

Choose a reason for hiding this comment

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

I explicitly made changes to the original mrtk shader to make variable usages clearer and cleaned up stuff. Did you just straight copy/paste?

@SimonDarksideJ
Copy link
Contributor Author

If you made changes for clarity, better to handle this in the documentation, since we are unlikely to be modifying this functionality.

@SimonDarksideJ SimonDarksideJ merged commit 98ef57f into development Jul 30, 2019
@SimonDarksideJ SimonDarksideJ deleted the bugfix/wireframeshader branch July 30, 2019 11:29
@StephenHodgson
Copy link
Contributor

Did this work for Android?

@SimonDarksideJ
Copy link
Contributor Author

It works for Android but not on the Quest or Go as they don't support Geometry shaders.
But the new shader doesn't cause an Android build to fail now and it doesn't crash on the device (just prevents rendering when in view)

@StephenHodgson
Copy link
Contributor

StephenHodgson commented Jul 30, 2019

Getting these shader errors now
image

Shader error in 'Mixed Reality Toolkit/Standard': Non system-generated input signature parameter (BLENDINDICES) cannot appear after a system generated value. at line 823 (on gles3)
Shader error in 'Mixed Reality Toolkit/Standard': Non system-generated input signature parameter (BLENDINDICES) cannot appear after a system generated value. at line 823 (on glcore)

@SimonDarksideJ
Copy link
Contributor Author

Where are you getting those errors, and on which platform?
Do you want to raise an issue

@StephenHodgson
Copy link
Contributor

It showed up when I was trying to update to 2019.2 on the lumin build target

@SimonDarksideJ
Copy link
Contributor Author

So this doesn't happen in 2019.1, it's only just showed up in 2019.2 then. Oh shock horror... Because Unity :S

@StephenHodgson
Copy link
Contributor

opened #263 in response to this.

@SimonDarksideJ
Copy link
Contributor Author

Just spotted, thanks. Although concerned at how it seems to have gotten worse, may have to rollback till we have a fix

@StephenHodgson
Copy link
Contributor

It's not the wireframe shader I'm worried about. It was the standard shader changes.

@StephenHodgson
Copy link
Contributor

Let's roll it all back and just make changes to the wireframe shader

StephenHodgson added a commit that referenced this pull request Aug 6, 2019
@SimonDarksideJ
Copy link
Contributor Author

Agreed, let's roll back. But I'll remove the old wireframe shader from the SDK until we have a working solution. It'll have to be a project only thing until we have something that at least compiles on all platforms

StephenHodgson added a commit that referenced this pull request Aug 6, 2019
XRTK-Build-Bot pushed a commit that referenced this pull request Aug 8, 2019
* Update Wireframe Shader to new MRTK standard
Resolves #189

* Reverted Property names back to original names

* Updated shader based on comments, removed superfluous white spaces
XRTK-Build-Bot pushed a commit that referenced this pull request Aug 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants