-
Notifications
You must be signed in to change notification settings - Fork 9
Get glslify working with ify-loader #9
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
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
c47745a
Add failing fixture for glsl
rreusser e7ede11
Add failing glslify example
rreusser 6794552
Fix lint
rreusser 1664858
Uncomment other tests
rreusser 355a05b
Add proper output fixture
rreusser 9b1bd81
Add proper webpack config
rreusser 5a43255
Test with glslify
rreusser d649939
Restore tests
rreusser 6cc7b61
Remove unused items from the glsl test
rreusser cd382fc
Remove double-specified input in glsl test
rreusser 9075fd6
Remove extra console.errors from test
rreusser File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
const glsl = require('glslify') | ||
|
||
console.log(glsl` | ||
precision mediump float; | ||
#pragma glslify: ones = require(./ones) | ||
void main () { | ||
gl_FragColor = ones(); | ||
} | ||
`) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
vec4 ones () { | ||
return vec4(1); | ||
} | ||
#pragma glslify: export(ones) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
|
||
precision mediump float; | ||
#define GLSLIFY 1 | ||
#define GLSLIFY 1 | ||
vec4 ones () { | ||
return vec4(1); | ||
} | ||
|
||
void main () { | ||
gl_FragColor = ones(); | ||
} | ||
, | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"name": "fixture", | ||
"version": "1.0.0", | ||
"scripts": { | ||
"build": "../../node_modules/.bin/webpack webpack.config.js" | ||
}, | ||
"browserify": { | ||
"transform": [ | ||
"glslify" | ||
] | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
const path = require('path') | ||
|
||
module.exports = { | ||
entry: './index.js', | ||
output: { | ||
path: __dirname, | ||
filename: 'bundle.js' | ||
}, | ||
module: { | ||
rules: [{ | ||
test: /\.js/, | ||
use: path.join(__dirname, '..', '..') | ||
}] | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know why this comma exists in the output, but perhaps it's nothing problematic. A large library with lots of glsl like plotly.js compiles fine, so I'm led to believe there's not a fundamental problem here. I'm going to check it off since I'm not concerned enough to investigate too deeply, but if it looks fishy to someone else, I'm glad to dig a bit.