Skip to content

Commit d2869b8

Browse files
jpobstjpobst
authored
[Mono.Android] Fix omitted Gl* constants. (#9009)
Fixes: #8612 Some OpenGL constants get removed because they conflict with method names after they go through our capitalization correction. For example, [`GLES20.GL_CULL_FACE`][0] *would* be bound as `GLES20.GlCullFace`, which then conflicts with the method named [`GLES20.GlCullFace(int)`][1], so it is skipped:: warning BG8401: Skipping 'Android.Opengl.GLES20.GlCullFace' due to a duplicate method name. (Java type: 'android.opengl.GLES20') Fix these cases by using metadata to assign explicit `managedName` values that are the expected constant name + `Const` to avoid the name collision. [0]: ]https://developer.android.com/reference/android/opengl/GLES20#GL_CULL_FACE [1]: ]https://developer.android.com/reference/android/opengl/GLES20#glCullFace(int)
1 parent 3ab74db commit d2869b8

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

‎src/Mono.Android/PublicAPI/API-35/PublicAPI.Unshipped.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2201,6 +2201,26 @@ const Android.Nfc.NfcAdapter.FlagListenNfcPassiveB = 2 -> int
22012201
const Android.Nfc.NfcAdapter.FlagListenNfcPassiveF = 4 -> int
22022202
const Android.Nfc.NfcAdapter.FlagReaderDisable = 0 -> int
22032203
const Android.Nfc.NfcAdapter.FlagReaderKeep = -2147483648 -> int
2204+
const Android.Opengl.GLES10.GlClearConst = 5376 -> int
2205+
const Android.Opengl.GLES10.GlCullFaceConst = 2884 -> int
2206+
const Android.Opengl.GLES10.GlPointSizeConst = 2833 -> int
2207+
const Android.Opengl.GLES10.GlSampleCoverageConst = 32928 -> int
2208+
const Android.Opengl.GLES20.GlActiveTextureConst = 34016 -> int
2209+
const Android.Opengl.GLES20.GlBlendColorConst = 32773 -> int
2210+
const Android.Opengl.GLES20.GlBlendEquationConst = 32777 -> int
2211+
const Android.Opengl.GLES20.GlCullFaceConst = 2884 -> int
2212+
const Android.Opengl.GLES20.GlDepthFuncConst = 2932 -> int
2213+
const Android.Opengl.GLES20.GlFrontFaceConst = 2886 -> int
2214+
const Android.Opengl.GLES20.GlLineWidthConst = 2849 -> int
2215+
const Android.Opengl.GLES20.GlSampleCoverageConst = 32928 -> int
2216+
const Android.Opengl.GLES20.GlStencilFuncConst = 2962 -> int
2217+
const Android.Opengl.GLES20.GlViewPortConst = 2978 -> int
2218+
const Android.Opengl.GLES30.GlReadBufferConst = 3074 -> int
2219+
const Android.Opengl.GLES30.GlTransformFeedbackVaryingsConst = 35971 -> int
2220+
const Android.Opengl.GLES30.GlUniformBlockBindingConst = 35391 -> int
2221+
const Android.Opengl.GLES31.GlVertexAttribBindingConst = 33492 -> int
2222+
const Android.Opengl.GLES31.GlVertexBindingDivisorConst = 33494 -> int
2223+
const Android.Opengl.GLES32.GlPrimitiveBoundingBoxConst = 37566 -> int
22042224
const Android.OS.Build.VERSION_CODES.VanillaIceCream = 10000 -> int
22052225
const Android.OS.PowerMonitor.InterfaceConsts.ContentsFileDescriptor = 1 -> int
22062226
const Android.OS.PowerMonitor.InterfaceConsts.ParcelableWriteReturnValue = Android.OS.ParcelableWriteFlags.ReturnValue -> Android.OS.ParcelableWriteFlags

‎src/Mono.Android/metadata

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,6 +1925,28 @@
19251925
<!-- These new default interface methods on a Listener interface cause duplicate named EventHandlers to be generated, change to a unique name. -->
19261926
<attr api-since="35" path="/api/package[@name='android.app']/interface[@name='AppOpsManager.OnOpActiveChangedListener']/method[@name='onOpActiveChanged' and count(parameter)=8 and parameter[1][@type='java.lang.String'] and parameter[2][@type='int'] and parameter[3][@type='java.lang.String'] and parameter[4][@type='java.lang.String'] and parameter[5][@type='int'] and parameter[6][@type='boolean'] and parameter[7][@type='int'] and parameter[8][@type='int']]" name="managedName">OnOpActiveChanged2</attr>
19271927
<attr api-since="35" path="/api/package[@name='android.app']/interface[@name='AppOpsManager.OnOpChangedListener']/method[@name='onOpChanged' and count(parameter)=4 and parameter[1][@type='java.lang.String'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='int'] and parameter[4][@type='java.lang.String']]" name="managedName">OnOpChanged2</attr>
1928+
1929+
<!-- Once our capitalization changes are applied to these constants they conflict with a method name. -->
1930+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES10']/field[@name='GL_CLEAR']" name="managedName">GlClearConst</attr>
1931+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES10']/field[@name='GL_CULL_FACE']" name="managedName">GlCullFaceConst</attr>
1932+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES10']/field[@name='GL_POINT_SIZE']" name="managedName">GlPointSizeConst</attr>
1933+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES10']/field[@name='GL_SAMPLE_COVERAGE']" name="managedName">GlSampleCoverageConst</attr>
1934+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_ACTIVE_TEXTURE']" name="managedName">GlActiveTextureConst</attr>
1935+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_BLEND_COLOR']" name="managedName">GlBlendColorConst</attr>
1936+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_BLEND_EQUATION']" name="managedName">GlBlendEquationConst</attr>
1937+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_CULL_FACE']" name="managedName">GlCullFaceConst</attr>
1938+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_DEPTH_FUNC']" name="managedName">GlDepthFuncConst</attr>
1939+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_FRONT_FACE']" name="managedName">GlFrontFaceConst</attr>
1940+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_LINE_WIDTH']" name="managedName">GlLineWidthConst</attr>
1941+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_SAMPLE_COVERAGE']" name="managedName">GlSampleCoverageConst</attr>
1942+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_STENCIL_FUNC']" name="managedName">GlStencilFuncConst</attr>
1943+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES20']/field[@name='GL_VIEWPORT']" name="managedName">GlViewPortConst</attr>
1944+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES30']/field[@name='GL_READ_BUFFER']" name="managedName">GlReadBufferConst</attr>
1945+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES30']/field[@name='GL_TRANSFORM_FEEDBACK_VARYINGS']" name="managedName">GlTransformFeedbackVaryingsConst</attr>
1946+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES30']/field[@name='GL_UNIFORM_BLOCK_BINDING']" name="managedName">GlUniformBlockBindingConst</attr>
1947+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES31']/field[@name='GL_VERTEX_ATTRIB_BINDING']" name="managedName">GlVertexAttribBindingConst</attr>
1948+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES31']/field[@name='GL_VERTEX_BINDING_DIVISOR']" name="managedName">GlVertexBindingDivisorConst</attr>
1949+
<attr api-since="35" path="/api/package[@name='android.opengl']/class[@name='GLES32']/field[@name='GL_PRIMITIVE_BOUNDING_BOX']" name="managedName">GlPrimitiveBoundingBoxConst</attr>
19281950

19291951
<!--
19301952
***********************************************************************

0 commit comments

Comments
 (0)