Skip to content

add glsl version support #2

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add glsl version support #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions core/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export {

export type { Vector2, Vector3, Vector4 }

const VERSIONS = ['100', '300 es', '310 es'];
const PRECISIONS = ['lowp', 'mediump', 'highp']
const FS_MAIN_SHADER = `\nvoid main(void){
vec4 color = vec4(0.0,0.0,0.0,1.0);
Expand Down Expand Up @@ -89,6 +90,11 @@ type Props = {
/** Fragment shader GLSL code. */
fs: string

/**
* The version of the GLSL code. Defaults to "300 es"
*/
version?: string

/** Vertex shader GLSL code. */
vs?: string

Expand Down Expand Up @@ -479,7 +485,16 @@ export class Shader extends Component<Props, unknown> {
} else if (onDoneLoadingTextures) onDoneLoadingTextures()
}
preProcessFragment = (fragment: string) => {
const { precision, devicePixelRatio = 1 } = this.props
const { version, precision, devicePixelRatio = 1 } = this.props
const isValidVersion = VERSIONS.includes(version ?? '300 es')
const versionString = `#version ${isValidVersion ? version : VERSIONS[1]}\n`
if (!isValidVersion) {
this.props.onWarning?.(
log(
`wrong version ${version}, please make sure to pass one of a valid version 100, 300 es, 310es, by default you shader version will be set to 300 es.`,
),
)
}
const isValidPrecision = PRECISIONS.includes(precision ?? 'highp')
const precisionString = `precision ${isValidPrecision ? precision : PRECISIONS[1]} float;\n`
if (!isValidPrecision) {
Expand All @@ -489,7 +504,8 @@ export class Shader extends Component<Props, unknown> {
),
)
}
let fs = precisionString
let fs = versionString
.concat(precisionString)
.concat(`#define DPR ${devicePixelRatio.toFixed(1)}\n`)
.concat(fragment.replace(/texture\(/g, 'texture2D('))
for (const uniform of Object.keys(this.uniforms)) {
Expand Down