Switch to ALL CAPS const values.

xlab · xlab · commit f6f54fd496f3 · 2017-01-06T23:48:22.000+03:00
diff --git a/example-egl/main.go b/example-egl/main.go
@@ -109,14 +109,14 @@ func main() {
 }
 
 func initGL() {
-	gl.Hint(gl.PerspectiveCorrectionHint, gl.Fastest)
-	gl.Enable(gl.CullFace)
-	gl.Disable(gl.DepthTest)
-	gl.SetShadeModel(gl.Smooth)
+	gl.Hint(gl.PERSPECTIVE_CORRECTION_HINT, gl.FASTEST)
+	gl.Enable(gl.CULL_FACE)
+	gl.Disable(gl.DEPTH_TEST)
+	gl.ShadeModel(gl.SMOOTH)
 }
 
 func draw(handle *DisplayHandle, x, y, z float32) {
 	gl.ClearColor(x, y, z, 1)
-	gl.ClearFunc(gl.ColorBufferBit)
+	gl.Clear(gl.COLOR_BUFFER_BIT)
 	egl.SwapBuffers(handle.display, handle.surface)
 }
diff --git a/gles.yml b/gles.yml
@@ -34,34 +34,16 @@ TRANSLATOR:
     function:
       - {action: accept, from: ^gl}
       - {action: replace, from: ^gl}
-      #  avoid collision with param constants
-      - {action: replace, from: LineWidth$, to: "SetLineWidth"}
-      - {action: replace, from: PointSize$, to: "SetPointSize"}
-      - {action: replace, from: ActiveTexture$, to: "SetActiveTexture"}
-      - {action: replace, from: Clear$, to: "ClearFunc"}
-      - {action: replace, from: ClientActiveTexture$, to: "SetClientActiveTexture"}
-      - {action: replace, from: CullFace$, to: "SetCullFace"}
-      - {action: replace, from: DepthFunc$, to: "SetDepthFunc"}
-      - {action: replace, from: FrontFace$, to: "SetFrontFace"}
-      - {action: replace, from: MatrixMode$, to: "SetMatrixMode"}
-      - {action: replace, from: SampleCoverage$, to: "SetSampleCoverage"}
-      - {action: replace, from: ShadeModel$, to: "SetShadeModel"}
-      - {action: replace, from: StencilFunc$, to: "SetStencilFunc"}
-      - {action: replace, from: Viewport$, to: "SetViewport"}
+      - {transform: export}
     type:
       - {action: replace, from: "_t$"}
+      - {transform: export}
+      - {load: snakecase}
     const:
-      - {action: replace, from: FLOAT$, to: FLOAT_TYPE}
-      - {action: replace, from: BYTE$, to: BYTE_TYPE}
-      - {action: replace, from: SHORT$, to: SHORT_TYPE}
-      - {action: replace, from: FIXED$, to: FIXED_TYPE}
-      - {transform: lower}
+      - {action: replace, from: "^_"}
     private:
       - {transform: unexport}
+      - {load: snakecase}
     post-global:
       - {action: doc, from: "^gl",
-              to: "https://www.khronos.org/opengles/sdk/docs/man/xhtml/$name.xml"}
-      - {transform: export}
-      - {load: snakecase}
-
-
+              to: "https://www.khronos.org/opengles/sdk/1.1/docs/man/$name.xml"}
diff --git a/gles2.yml b/gles2.yml
@@ -37,45 +37,33 @@ TRANSLATOR:
       - {target: ^glGetProgramInfoLog$, tips: [0,size,ref,arr]}
       - {target: ^glGetShaderPrecisionFormat$, tips: [0,0,arr,ref]}
       - {target: ^glGetVertexAttribPointerv$, tips: [0,0,ref]}
-      - {target: ^glUniformMatrix4fv$, tips: [0,0,0,ref]}
+      # parameter at the end:
+      - {target: ^glUniformMatrix, tips: [0,0,0,ref]}
+      - {target: iv$, tips: [0,0,ref]}
+      - {target: fv$, tips: [0,0,ref]}
+      
   TypeTips:
     function:
       # do not stick with GL types, use Go types for API instead
       - {target: ., self: plain, tips: [plain,plain,plain,plain,plain,plain,plain,plain,plain]}
-      
+   
   Rules: 
     global:
       - {action: accept, from: "^GL"}
       - {action: replace, from: "^GL"}
     function:
       - {action: accept, from: ^gl}
       - {action: replace, from: ^gl}
-      #  avoid collision with param constants
-      - {action: replace, from: ActiveTexture$, to: "SetActiveTexture"}
-      - {action: replace, from: BlendColor$, to: "SetBlendColor"}
-      - {action: replace, from: BlendEquation$, to: "SetBlendEquation"}
-      - {action: replace, from: CullFace$, to: "SetCullFace"}
-      - {action: replace, from: DepthFunc$, to: "SetDepthFunc"}
-      - {action: replace, from: FrontFace$, to: "SetFrontFace"}
-      - {action: replace, from: LineWidth$, to: "SetLineWidth"}
-      - {action: replace, from: SampleCoverage$, to: "SetSampleCoverage"}
-      - {action: replace, from: StencilFunc$, to: "SetStencilFunc"}
-      - {action: replace, from: Viewport$, to: "SetViewport"}
+      - {transform: export}
     type:
       - {action: replace, from: "_t$"}
+      - {transform: export}
+      - {load: snakecase}
     const:
-      - {action: replace, from: FLOAT$, to: FLOAT_TYPE}
-      - {action: replace, from: BYTE$, to: BYTE_TYPE}
-      - {action: replace, from: SHORT$, to: SHORT_TYPE}
-      - {action: replace, from: FIXED$, to: FIXED_TYPE}
-      - {action: replace, from: INT$, to: INT_TYPE}
-      - {transform: lower}
+      - {action: replace, from: "^_"}
     private:
       - {transform: unexport}
+      - {load: snakecase}
     post-global:
       - {action: doc, from: "^gl",
               to: "https://www.khronos.org/opengles/sdk/docs/man/xhtml/$name.xml"}
-      - {transform: export}
-      - {load: snakecase}
-
-
diff --git a/gles3.yml b/gles3.yml
@@ -37,7 +37,11 @@ TRANSLATOR:
       - {target: ^glGetProgramInfoLog$, tips: [0,size,ref,arr]}
       - {target: ^glGetShaderPrecisionFormat$, tips: [0,0,arr,ref]}
       - {target: ^glGetVertexAttribPointerv$, tips: [0,0,ref]}
-      - {target: ^glUniformMatrix4fv$, tips: [0,0,0,ref]}
+      # parameter at the end:
+      - {target: ^glUniformMatrix, tips: [0,0,0,ref]}
+      - {target: iv$, tips: [0,0,ref]}
+      - {target: fv$, tips: [0,0,ref]}
+      
   TypeTips:
     function:
       # do not stick with GL types, use Go types for API instead
@@ -50,36 +54,16 @@ TRANSLATOR:
     function:
       - {action: accept, from: ^gl}
       - {action: replace, from: ^gl}
-      #  avoid collision with param constants
-      - {action: replace, from: ActiveTexture$, to: "SetActiveTexture"}
-      - {action: replace, from: BlendColor$, to: "SetBlendColor"}
-      - {action: replace, from: BlendEquation$, to: "SetBlendEquation"}
-      - {action: replace, from: CullFace$, to: "SetCullFace"}
-      - {action: replace, from: DepthFunc$, to: "SetDepthFunc"}
-      - {action: replace, from: FrontFace$, to: "SetFrontFace"}
-      - {action: replace, from: LineWidth$, to: "SetLineWidth"}
-      - {action: replace, from: SampleCoverage$, to: "SetSampleCoverage"}
-      - {action: replace, from: StencilFunc$, to: "SetStencilFunc"}
-      - {action: replace, from: Viewport$, to: "SetViewport"}
-      - {action: replace, from: ReadBuffer$, to: "SetReadBuffer"}
-      - {action: replace, from: TransformFeedbackVaryings$, to: "SetTransformFeedbackVaryings"}
-      - {action: replace, from: UniformBlockBinding$, to: "SetUniformBlockBinding"}
-  
+      - {transform: export}
     type:
       - {action: replace, from: "_t$"}
+      - {transform: export}
+      - {load: snakecase}
     const:
-      - {action: replace, from: FLOAT$, to: FLOAT_TYPE}
-      - {action: replace, from: BYTE$, to: BYTE_TYPE}
-      - {action: replace, from: SHORT$, to: SHORT_TYPE}
-      - {action: replace, from: FIXED$, to: FIXED_TYPE}
-      - {action: replace, from: INT$, to: INT_TYPE}
-      - {transform: lower}
+      - {action: replace, from: "^_"}
     private:
       - {transform: unexport}
+      - {load: snakecase}
     post-global:
       - {action: doc, from: "^gl",
               to: "https://www.khronos.org/opengles/sdk/docs/man3/html/$name.xhtml"}
-      - {transform: export}
-      - {load: snakecase}
-
-
diff --git a/gles31.yml b/gles31.yml
@@ -37,7 +37,11 @@ TRANSLATOR:
       - {target: ^glGetProgramInfoLog$, tips: [0,size,ref,arr]}
       - {target: ^glGetShaderPrecisionFormat$, tips: [0,0,arr,ref]}
       - {target: ^glGetVertexAttribPointerv$, tips: [0,0,ref]}
-      - {target: ^glUniformMatrix4fv$, tips: [0,0,0,ref]}
+      # parameter at the end:
+      - {target: ^glUniformMatrix, tips: [0,0,0,ref]}
+      - {target: iv$, tips: [0,0,ref]}
+      - {target: fv$, tips: [0,0,ref]}
+      
   TypeTips:
     function:
       # do not stick with GL types, use Go types for API instead
@@ -50,38 +54,16 @@ TRANSLATOR:
     function:
       - {action: accept, from: ^gl}
       - {action: replace, from: ^gl}
-      #  avoid collision with param constants
-      - {action: replace, from: ActiveTexture$, to: "SetActiveTexture"}
-      - {action: replace, from: BlendColor$, to: "SetBlendColor"}
-      - {action: replace, from: BlendEquation$, to: "SetBlendEquation"}
-      - {action: replace, from: CullFace$, to: "SetCullFace"}
-      - {action: replace, from: DepthFunc$, to: "SetDepthFunc"}
-      - {action: replace, from: FrontFace$, to: "SetFrontFace"}
-      - {action: replace, from: LineWidth$, to: "SetLineWidth"}
-      - {action: replace, from: SampleCoverage$, to: "SetSampleCoverage"}
-      - {action: replace, from: StencilFunc$, to: "SetStencilFunc"}
-      - {action: replace, from: Viewport$, to: "SetViewport"}
-      - {action: replace, from: ReadBuffer$, to: "SetReadBuffer"}
-      - {action: replace, from: TransformFeedbackVaryings$, to: "SetTransformFeedbackVaryings"}
-      - {action: replace, from: UniformBlockBinding$, to: "SetUniformBlockBinding"}
-      - {action: replace, from: VertexAttribBinding$, to: "SetVertexAttribBinding"}
-      - {action: replace, from: VertexBindingDivisor$, to: "SetVertexBindingDivisor"}
-  
+      - {transform: export}
     type:
       - {action: replace, from: "_t$"}
+      - {transform: export}
+      - {load: snakecase}
     const:
-      - {action: replace, from: FLOAT$, to: FLOAT_TYPE}
-      - {action: replace, from: BYTE$, to: BYTE_TYPE}
-      - {action: replace, from: SHORT$, to: SHORT_TYPE}
-      - {action: replace, from: FIXED$, to: FIXED_TYPE}
-      - {action: replace, from: INT$, to: INT_TYPE}
-      - {transform: lower}
+      - {action: replace, from: "^_"}
     private:
       - {transform: unexport}
+      - {load: snakecase}
     post-global:
       - {action: doc, from: "^gl",
               to: "https://www.khronos.org/opengles/sdk/docs/man31/html/$name.xhtml"}
-      - {transform: export}
-      - {load: snakecase}
-
-

Original file line number	Diff line number	Diff line change
`@@ -109,14 +109,14 @@ func main() {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`func initGL() {`
`112`		`- gl.Hint(gl.PerspectiveCorrectionHint, gl.Fastest)`
`113`		`- gl.Enable(gl.CullFace)`
`114`		`- gl.Disable(gl.DepthTest)`
`115`		`- gl.SetShadeModel(gl.Smooth)`
	`112`	`+ gl.Hint(gl.PERSPECTIVE_CORRECTION_HINT, gl.FASTEST)`
	`113`	`+ gl.Enable(gl.CULL_FACE)`
	`114`	`+ gl.Disable(gl.DEPTH_TEST)`
	`115`	`+ gl.ShadeModel(gl.SMOOTH)`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`func draw(handle *DisplayHandle, x, y, z float32) {`
`119`	`119`	`gl.ClearColor(x, y, z, 1)`
`120`		`- gl.ClearFunc(gl.ColorBufferBit)`
	`120`	`+ gl.Clear(gl.COLOR_BUFFER_BIT)`
`121`	`121`	`egl.SwapBuffers(handle.display, handle.surface)`
`122`	`122`	`}`