Skip to content

Commit 913505e

Browse files
jujjuj
authored
Use GL enum integer values instead of GL enum names to save space (emscripten-core#10096)
1 parent 735d2a3 commit 913505e

7 files changed

Lines changed: 222 additions & 222 deletions

File tree

‎src/library_egl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ var LibraryEGL = {
232232
{{{ makeSetValue('value', '0', 'EGL.contextAttributes.antialias ? 1 : 0' /* Multisampling enabled */, 'i32') }}};
233233
return 1;
234234
case 0x3033: // EGL_SURFACE_TYPE
235-
{{{ makeSetValue('value', '0', '0x0004' /* EGL_WINDOW_BIT */, 'i32') }}};
235+
{{{ makeSetValue('value', '0', '0x4' /* EGL_WINDOW_BIT */, 'i32') }}};
236236
return 1;
237237
case 0x3034: // EGL_TRANSPARENT_TYPE
238238
// If this returns EGL_TRANSPARENT_RGB (0x3052), transparency is used through color-keying. No such thing applies to Emscripten canvas.
@@ -264,7 +264,7 @@ var LibraryEGL = {
264264
return 1;
265265
case 0x3040: // EGL_RENDERABLE_TYPE
266266
// A bit combination of EGL_OPENGL_ES_BIT,EGL_OPENVG_BIT,EGL_OPENGL_ES2_BIT and EGL_OPENGL_BIT.
267-
{{{ makeSetValue('value', '0', '0x0004' /* EGL_OPENGL_ES2_BIT */, 'i32') }}};
267+
{{{ makeSetValue('value', '0', '0x4' /* EGL_OPENGL_ES2_BIT */, 'i32') }}};
268268
return 1;
269269
case 0x3042: // EGL_CONFORMANT
270270
// "EGL_CONFORMANT is a mask indicating if a client API context created with respect to the corresponding EGLConfig will pass the required conformance tests for that API."

‎src/library_glemu.js‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var LibraryGLEmulation = {
1818
fogEnd: 1,
1919
fogDensity: 1.0,
2020
fogColor: null,
21-
fogMode: 0x0800, // GL_EXP
21+
fogMode: 0x800, // GL_EXP
2222
fogEnabled: false,
2323

2424
// VAO support
@@ -81,12 +81,12 @@ var LibraryGLEmulation = {
8181

8282
// XXX some of the capabilities we don't support may lead to incorrect rendering, if we do not emulate them in shaders
8383
var validCapabilities = {
84-
0x0B44: 1, // GL_CULL_FACE
85-
0x0BE2: 1, // GL_BLEND
86-
0x0BD0: 1, // GL_DITHER,
87-
0x0B90: 1, // GL_STENCIL_TEST
88-
0x0B71: 1, // GL_DEPTH_TEST
89-
0x0C11: 1, // GL_SCISSOR_TEST
84+
0xB44: 1, // GL_CULL_FACE
85+
0xBE2: 1, // GL_BLEND
86+
0xBD0: 1, // GL_DITHER,
87+
0xB90: 1, // GL_STENCIL_TEST
88+
0xB71: 1, // GL_DEPTH_TEST
89+
0xC11: 1, // GL_SCISSOR_TEST
9090
0x8037: 1, // GL_POLYGON_OFFSET_FILL
9191
0x809E: 1, // GL_SAMPLE_ALPHA_TO_COVERAGE
9292
0x80A0: 1 // GL_SAMPLE_COVERAGE
@@ -110,13 +110,13 @@ var LibraryGLEmulation = {
110110
// Clean up the renderer on any change to the rendering state. The optimization of
111111
// skipping renderer setup is aimed at the case of multiple glDraw* right after each other
112112
if (GLImmediate.lastRenderer) GLImmediate.lastRenderer.cleanup();
113-
if (cap == 0x0B60 /* GL_FOG */) {
113+
if (cap == 0xB60 /* GL_FOG */) {
114114
if (GLEmulation.fogEnabled != true) {
115115
GLImmediate.currentRenderer = null; // Fog parameter is part of the FFP shader state, we must re-lookup the renderer to use.
116116
GLEmulation.fogEnabled = true;
117117
}
118118
return;
119-
} else if (cap == 0x0de1 /* GL_TEXTURE_2D */) {
119+
} else if (cap == 0xDE1 /* GL_TEXTURE_2D */) {
120120
// XXX not according to spec, and not in desktop GL, but works in some GLES1.x apparently, so support
121121
// it by forwarding to glEnableClientState
122122
/* Actually, let's not, for now. (This sounds exceedingly broken)
@@ -134,13 +134,13 @@ var LibraryGLEmulation = {
134134
var glDisable = _glDisable;
135135
_glDisable = _emscripten_glDisable = function _glDisable(cap) {
136136
if (GLImmediate.lastRenderer) GLImmediate.lastRenderer.cleanup();
137-
if (cap == 0x0B60 /* GL_FOG */) {
137+
if (cap == 0xB60 /* GL_FOG */) {
138138
if (GLEmulation.fogEnabled != false) {
139139
GLImmediate.currentRenderer = null; // Fog parameter is part of the FFP shader state, we must re-lookup the renderer to use.
140140
GLEmulation.fogEnabled = false;
141141
}
142142
return;
143-
} else if (cap == 0x0de1 /* GL_TEXTURE_2D */) {
143+
} else if (cap == 0xDE1 /* GL_TEXTURE_2D */) {
144144
// XXX not according to spec, and not in desktop GL, but works in some GLES1.x apparently, so support
145145
// it by forwarding to glDisableClientState
146146
/* Actually, let's not, for now. (This sounds exceedingly broken)
@@ -156,7 +156,7 @@ var LibraryGLEmulation = {
156156
{{{ updateExport('glDisable') }}}
157157

158158
_glIsEnabled = _emscripten_glIsEnabled = function _glIsEnabled(cap) {
159-
if (cap == 0x0B60 /* GL_FOG */) {
159+
if (cap == 0xB60 /* GL_FOG */) {
160160
return GLEmulation.fogEnabled ? 1 : 0;
161161
} else if (!(cap in validCapabilities)) {
162162
return 0;
@@ -509,21 +509,21 @@ var LibraryGLEmulation = {
509509

510510
var glGetFloatv = _glGetFloatv;
511511
_glGetFloatv = _emscripten_glGetFloatv = function _glGetFloatv(pname, params) {
512-
if (pname == 0x0BA6) { // GL_MODELVIEW_MATRIX
512+
if (pname == 0xBA6) { // GL_MODELVIEW_MATRIX
513513
HEAPF32.set(GLImmediate.matrix[0/*m*/], params >> 2);
514-
} else if (pname == 0x0BA7) { // GL_PROJECTION_MATRIX
514+
} else if (pname == 0xBA7) { // GL_PROJECTION_MATRIX
515515
HEAPF32.set(GLImmediate.matrix[1/*p*/], params >> 2);
516-
} else if (pname == 0x0BA8) { // GL_TEXTURE_MATRIX
516+
} else if (pname == 0xBA8) { // GL_TEXTURE_MATRIX
517517
HEAPF32.set(GLImmediate.matrix[2/*t*/ + GLImmediate.clientActiveTexture], params >> 2);
518-
} else if (pname == 0x0B66) { // GL_FOG_COLOR
518+
} else if (pname == 0xB66) { // GL_FOG_COLOR
519519
HEAPF32.set(GLEmulation.fogColor, params >> 2);
520-
} else if (pname == 0x0B63) { // GL_FOG_START
520+
} else if (pname == 0xB63) { // GL_FOG_START
521521
{{{ makeSetValue('params', '0', 'GLEmulation.fogStart', 'float') }}};
522-
} else if (pname == 0x0B64) { // GL_FOG_END
522+
} else if (pname == 0xB64) { // GL_FOG_END
523523
{{{ makeSetValue('params', '0', 'GLEmulation.fogEnd', 'float') }}};
524-
} else if (pname == 0x0B62) { // GL_FOG_DENSITY
524+
} else if (pname == 0xB62) { // GL_FOG_DENSITY
525525
{{{ makeSetValue('params', '0', 'GLEmulation.fogDensity', 'float') }}};
526-
} else if (pname == 0x0B65) { // GL_FOG_MODE
526+
} else if (pname == 0xB65) { // GL_FOG_MODE
527527
{{{ makeSetValue('params', '0', 'GLEmulation.fogMode', 'float') }}};
528528
} else {
529529
glGetFloatv(pname, params);
@@ -569,7 +569,7 @@ var LibraryGLEmulation = {
569569
getAttributeFromCapability: function(cap) {
570570
var attrib = null;
571571
switch (cap) {
572-
case 0x0de1: // GL_TEXTURE_2D - XXX not according to spec, and not in desktop GL, but works in some GLES1.x apparently, so support it
572+
case 0xDE1: // GL_TEXTURE_2D - XXX not according to spec, and not in desktop GL, but works in some GLES1.x apparently, so support it
573573
#if ASSERTIONS
574574
abort("GL_TEXTURE_2D is not a spec-defined capability for gl{Enable,Disable}ClientState.");
575575
#endif
@@ -661,7 +661,7 @@ var LibraryGLEmulation = {
661661
case 0x8092: // GL_TEXTURE_COORD_ARRAY_POINTER
662662
attribute = GLImmediate.clientAttributes[GLImmediate.TEXTURE0 + GLImmediate.clientActiveTexture]; break;
663663
default:
664-
GL.recordError(0x0500/*GL_INVALID_ENUM*/);
664+
GL.recordError(0x500/*GL_INVALID_ENUM*/);
665665
#if GL_ASSERTIONS
666666
err('GL_INVALID_ENUM in glGetPointerv: Unsupported name ' + name + '!');
667667
#endif
@@ -806,8 +806,8 @@ var LibraryGLEmulation = {
806806
spawnTexEnvJIT: function() {
807807
// GL defs:
808808
var GL_TEXTURE0 = 0x84C0;
809-
var GL_TEXTURE_1D = 0x0DE0;
810-
var GL_TEXTURE_2D = 0x0DE1;
809+
var GL_TEXTURE_1D = 0xDE0;
810+
var GL_TEXTURE_2D = 0xDE1;
811811
var GL_TEXTURE_3D = 0x806f;
812812
var GL_TEXTURE_CUBE_MAP = 0x8513;
813813
var GL_TEXTURE_ENV = 0x2300;
@@ -840,18 +840,18 @@ var LibraryGLEmulation = {
840840
var GL_COMBINE_ALPHA = 0x8572;
841841

842842
var GL_RGB_SCALE = 0x8573;
843-
var GL_ALPHA_SCALE = 0x0D1C;
843+
var GL_ALPHA_SCALE = 0xD1C;
844844

845845
// env.mode
846-
var GL_ADD = 0x0104;
847-
var GL_BLEND = 0x0BE2;
846+
var GL_ADD = 0x104;
847+
var GL_BLEND = 0xBE2;
848848
var GL_REPLACE = 0x1E01;
849849
var GL_MODULATE = 0x2100;
850850
var GL_DECAL = 0x2101;
851851
var GL_COMBINE = 0x8570;
852852

853853
// env.color/alphaCombiner
854-
//var GL_ADD = 0x0104;
854+
//var GL_ADD = 0x104;
855855
//var GL_REPLACE = 0x1E01;
856856
//var GL_MODULATE = 0x2100;
857857
var GL_SUBTRACT = 0x84E7;
@@ -864,10 +864,10 @@ var LibraryGLEmulation = {
864864
var GL_PREVIOUS = 0x8578;
865865

866866
// env.color/alphaOp
867-
var GL_SRC_COLOR = 0x0300;
868-
var GL_ONE_MINUS_SRC_COLOR = 0x0301;
869-
var GL_SRC_ALPHA = 0x0302;
870-
var GL_ONE_MINUS_SRC_ALPHA = 0x0303;
867+
var GL_SRC_COLOR = 0x300;
868+
var GL_ONE_MINUS_SRC_COLOR = 0x301;
869+
var GL_SRC_ALPHA = 0x302;
870+
var GL_ONE_MINUS_SRC_ALPHA = 0x303;
871871

872872
var GL_RGB = 0x1907;
873873
var GL_RGBA = 0x1908;
@@ -1027,8 +1027,8 @@ var LibraryGLEmulation = {
10271027
// mode
10281028
0x1E01 /* GL_REPLACE */: 0,
10291029
0x2100 /* GL_MODULATE */: 1,
1030-
0x0104 /* GL_ADD */: 2,
1031-
0x0BE2 /* GL_BLEND */: 3,
1030+
0x104 /* GL_ADD */: 2,
1031+
0xBE2 /* GL_BLEND */: 3,
10321032
0x2101 /* GL_DECAL */: 4,
10331033
0x8570 /* GL_COMBINE */: 5,
10341034

@@ -1043,10 +1043,10 @@ var LibraryGLEmulation = {
10431043
0x8578 /* GL_PREVIOUS */: 3,
10441044

10451045
// color and alpha op
1046-
0x0300 /* GL_SRC_COLOR */: 0,
1047-
0x0301 /* GL_ONE_MINUS_SRC_COLOR */: 1,
1048-
0x0302 /* GL_SRC_ALPHA */: 2,
1049-
0x0303 /* GL_ONE_MINUS_SRC_ALPHA */: 3
1046+
0x300 /* GL_SRC_COLOR */: 0,
1047+
0x301 /* GL_ONE_MINUS_SRC_COLOR */: 1,
1048+
0x302 /* GL_SRC_ALPHA */: 2,
1049+
0x303 /* GL_ONE_MINUS_SRC_ALPHA */: 3
10501050
};
10511051

10521052
// The tuple (key0,key1,key2) uniquely identifies the state of the variables in CTexEnv.
@@ -1933,7 +1933,7 @@ var LibraryGLEmulation = {
19331933
var fogParam = 0;
19341934
if (GLEmulation.fogEnabled) {
19351935
switch (GLEmulation.fogMode) {
1936-
case 0x0801: // GL_EXP2
1936+
case 0x801: // GL_EXP2
19371937
fogParam = 1;
19381938
break;
19391939
case 0x2601: // GL_LINEAR
@@ -2016,7 +2016,7 @@ var LibraryGLEmulation = {
20162016
// that you cache the renderer based on the said parameters.
20172017
if (GLEmulation.fogEnabled) {
20182018
switch (GLEmulation.fogMode) {
2019-
case 0x0801: // GL_EXP2
2019+
case 0x801: // GL_EXP2
20202020
// fog = exp(-(gl_Fog.density * gl_FogFragCoord)^2)
20212021
var fogFormula = ' float fog = exp(-u_fogDensity * u_fogDensity * ecDistance * ecDistance); \n';
20222022
break;
@@ -2939,25 +2939,25 @@ var LibraryGLEmulation = {
29392939

29402940
glFogf: function(pname, param) { // partial support, TODO
29412941
switch(pname) {
2942-
case 0x0B63: // GL_FOG_START
2942+
case 0xB63: // GL_FOG_START
29432943
GLEmulation.fogStart = param; break;
2944-
case 0x0B64: // GL_FOG_END
2944+
case 0xB64: // GL_FOG_END
29452945
GLEmulation.fogEnd = param; break;
2946-
case 0x0B62: // GL_FOG_DENSITY
2946+
case 0xB62: // GL_FOG_DENSITY
29472947
GLEmulation.fogDensity = param; break;
2948-
case 0x0B65: // GL_FOG_MODE
2948+
case 0xB65: // GL_FOG_MODE
29492949
switch (param) {
2950-
case 0x0801: // GL_EXP2
2950+
case 0x801: // GL_EXP2
29512951
case 0x2601: // GL_LINEAR
29522952
if (GLEmulation.fogMode != param) {
29532953
GLImmediate.currentRenderer = null; // Fog mode is part of the FFP shader state, we must re-lookup the renderer to use.
29542954
GLEmulation.fogMode = param;
29552955
}
29562956
break;
29572957
default: // default to GL_EXP
2958-
if (GLEmulation.fogMode != 0x0800 /* GL_EXP */) {
2958+
if (GLEmulation.fogMode != 0x800 /* GL_EXP */) {
29592959
GLImmediate.currentRenderer = null; // Fog mode is part of the FFP shader state, we must re-lookup the renderer to use.
2960-
GLEmulation.fogMode = 0x0800 /* GL_EXP */;
2960+
GLEmulation.fogMode = 0x800 /* GL_EXP */;
29612961
}
29622962
break;
29632963
}
@@ -2971,21 +2971,21 @@ var LibraryGLEmulation = {
29712971
glFogfv__deps: ['glFogf'],
29722972
glFogfv: function(pname, param) { // partial support, TODO
29732973
switch(pname) {
2974-
case 0x0B66: // GL_FOG_COLOR
2974+
case 0xB66: // GL_FOG_COLOR
29752975
GLEmulation.fogColor[0] = {{{ makeGetValue('param', '0', 'float') }}};
29762976
GLEmulation.fogColor[1] = {{{ makeGetValue('param', '4', 'float') }}};
29772977
GLEmulation.fogColor[2] = {{{ makeGetValue('param', '8', 'float') }}};
29782978
GLEmulation.fogColor[3] = {{{ makeGetValue('param', '12', 'float') }}};
29792979
break;
2980-
case 0x0B63: // GL_FOG_START
2981-
case 0x0B64: // GL_FOG_END
2980+
case 0xB63: // GL_FOG_START
2981+
case 0xB64: // GL_FOG_END
29822982
_glFogf(pname, {{{ makeGetValue('param', '0', 'float') }}}); break;
29832983
}
29842984
},
29852985
glFogiv__deps: ['glFogf'],
29862986
glFogiv: function(pname, param) {
29872987
switch(pname) {
2988-
case 0x0B66: // GL_FOG_COLOR
2988+
case 0xB66: // GL_FOG_COLOR
29892989
GLEmulation.fogColor[0] = ({{{ makeGetValue('param', '0', 'i32') }}}/2147483647)/2.0+0.5;
29902990
GLEmulation.fogColor[1] = ({{{ makeGetValue('param', '4', 'i32') }}}/2147483647)/2.0+0.5;
29912991
GLEmulation.fogColor[2] = ({{{ makeGetValue('param', '8', 'i32') }}}/2147483647)/2.0+0.5;
@@ -3225,7 +3225,7 @@ var LibraryGLEmulation = {
32253225

32263226
glPopMatrix: function() {
32273227
if (GLImmediate.matrixStack[GLImmediate.currentMatrix].length == 0) {
3228-
GL.recordError(0x0504/*GL_STACK_UNDERFLOW*/);
3228+
GL.recordError(0x504/*GL_STACK_UNDERFLOW*/);
32293229
return;
32303230
}
32313231
GLImmediate.matricesModified = true;

‎src/library_html5.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2749,7 +2749,7 @@ var LibraryJSEvents = {
27492749
if (canvas.offscreenCanvas) canvas = canvas.offscreenCanvas;
27502750
var autoResizeViewport = false;
27512751
if (canvas.GLctxObject && canvas.GLctxObject.GLctx) {
2752-
var prevViewport = canvas.GLctxObject.GLctx.getParameter(canvas.GLctxObject.GLctx.VIEWPORT);
2752+
var prevViewport = canvas.GLctxObject.GLctx.getParameter(0xBA2 /* GL_VIEWPORT */);
27532753
// TODO: Perhaps autoResizeViewport should only be true if FBO 0 is currently active?
27542754
autoResizeViewport = (prevViewport[0] === 0 && prevViewport[1] === 0 && prevViewport[2] === canvas.width && prevViewport[3] === canvas.height);
27552755
#if GL_DEBUG

0 commit comments

Comments
 (0)