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

Implement HLSL syntax highlighting, and use HLSL grammar to highlight Cg blocks in ShaderLab files #20129

Merged
merged 2 commits into from
Feb 20, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update OSSREADME files to point to source repository for HLSL and Sha…
…derLab grammars

Related to #20129.
  • Loading branch information
tgjones committed Feb 18, 2017
commit 1a3094efcca5941bd25847e2e09ea61ff5a77d8a
9 changes: 9 additions & 0 deletions extensions/hlsl/OSSREADME.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:

[{
"name": "shaders-tmLanguage-hlsl",
"version": "0.1.0",
"license": "MIT",
"repositoryURL": "https://github.com/tgjones/shaders-tmLanguage",
"description": "The file syntaxes/hlsl.json was included from https://github.com/tgjones/shaders-tmLanguage/blob/master/grammars/hlsl.json."
}]
6 changes: 3 additions & 3 deletions extensions/shaderlab/OSSREADME.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:

[{
"name": "unity-shader-files",
"name": "shaders-tmLanguage-shaderlab",
"version": "0.1.0",
"license": "MIT",
"repositoryURL": "https://github.com/nadege/unity-shader-files",
"description": "The file syntaxes/shaderlab.json was derived from the Atom package https://github.com/nadege/unity-shader-files."
"repositoryURL": "https://github.com/tgjones/shaders-tmLanguage",
"description": "The file syntaxes/shaderlab.json was included from https://github.com/tgjones/shaders-tmLanguage/blob/master/grammars/shaderlab.json."
}]