Skip to content

Commit 136a725

Browse files
sbc100sbc100
committed
[wasm64] Fix reading/writing of gl attributes
See #21177
1 parent 72c3be3 commit 136a725

File tree

7 files changed

+48
-40
lines changed

7 files changed

+48
-40
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,7 @@ jobs:
817817
browser64_4gb.test_audio_worklet*
818818
browser64_4gb.test_emscripten_log
819819
browser64_4gb.test_clientside_vertex_arrays_es3
820+
browser64_4gb.test_emscripten_animate_canvas_element_size*
820821
"
821822
test-browser-firefox:
822823
executor: bionic

‎src/library_html5_webgl.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ var LibraryHtml5WebGL = {
3030
HEAP32[a+i] = 0;
3131
}
3232

33-
HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.alpha }}}>>2)] =
34-
HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.depth }}}>>2)] =
35-
HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.antialias }}}>>2)] =
36-
HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.premultipliedAlpha }}}>>2)] =
37-
HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.majorVersion }}}>>2)] =
38-
HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.enableExtensionsByDefault }}}>>2)] = 1;
33+
HEAP8[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.alpha }}})] =
34+
HEAP8[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.depth }}})] =
35+
HEAP8[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.antialias }}})] =
36+
HEAP8[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.premultipliedAlpha }}})] =
37+
HEAP8[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.majorVersion }}})] =
38+
HEAP8[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.enableExtensionsByDefault }}})] = 1;
3939

4040
#if PTHREADS
4141
// Default context initialization state (user can override):
@@ -80,25 +80,25 @@ var LibraryHtml5WebGL = {
8080
#if ASSERTIONS
8181
assert(attributes);
8282
#endif
83-
var a = attributes >> 2;
84-
var powerPreference = HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.powerPreference }}}>>2)];
83+
var powerPreference = {{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.powerPreference, 'i32') }}};
8584
var contextAttributes = {
86-
'alpha': !!HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.alpha }}}>>2)],
87-
'depth': !!HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.depth }}}>>2)],
88-
'stencil': !!HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.stencil }}}>>2)],
89-
'antialias': !!HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.antialias }}}>>2)],
90-
'premultipliedAlpha': !!HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.premultipliedAlpha }}}>>2)],
91-
'preserveDrawingBuffer': !!HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.preserveDrawingBuffer }}}>>2)],
85+
'alpha': !!{{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.alpha, 'i32') }}},
86+
'depth': !!{{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.depth, 'i32') }}},
87+
'stencil': !!{{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.stencil, 'i32') }}},
88+
'antialias': !!{{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.antialias, 'i32') }}},
89+
'premultipliedAlpha': !!{{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.premultipliedAlpha, 'i32') }}},
90+
'preserveDrawingBuffer': !!{{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.preserveDrawingBuffer, 'i32') }}},
9291
'powerPreference': emscripten_webgl_power_preferences[powerPreference],
93-
'failIfMajorPerformanceCaveat': !!HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.failIfMajorPerformanceCaveat }}}>>2)],
92+
'failIfMajorPerformanceCaveat': !!{{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.failIfMajorPerformanceCaveat, 'i32') }}},
9493
// The following are not predefined WebGL context attributes in the WebGL specification, so the property names can be minified by Closure.
95-
majorVersion: HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.majorVersion }}}>>2)],
96-
minorVersion: HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.minorVersion }}}>>2)],
97-
enableExtensionsByDefault: HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.enableExtensionsByDefault }}}>>2)],
98-
explicitSwapControl: HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.explicitSwapControl }}}>>2)],
99-
proxyContextToMainThread: HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.proxyContextToMainThread }}}>>2)],
100-
renderViaOffscreenBackBuffer: HEAP32[a + ({{{ C_STRUCTS.EmscriptenWebGLContextAttributes.renderViaOffscreenBackBuffer }}}>>2)]
94+
majorVersion: {{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.majorVersion, 'i32') }}},
95+
minorVersion: {{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.minorVersion, 'i32') }}},
96+
enableExtensionsByDefault: {{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.enableExtensionsByDefault, 'i32') }}},
97+
explicitSwapControl: {{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.explicitSwapControl, 'i32') }}},
98+
proxyContextToMainThread: {{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.proxyContextToMainThread, 'i32') }}},
99+
renderViaOffscreenBackBuffer: {{{ makeGetValue('attributes', C_STRUCTS.EmscriptenWebGLContextAttributes.renderViaOffscreenBackBuffer, 'i32') }}}
101100
};
101+
err(contextAttributes);
102102

103103
var canvas = findCanvasEventTarget(target);
104104

‎test/code_size/hello_webgl2_wasm.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 569,
33
"a.html.gz": 379,
4-
"a.js": 4681,
5-
"a.js.gz": 2412,
4+
"a.js": 4744,
5+
"a.js.gz": 2427,
66
"a.wasm": 10388,
77
"a.wasm.gz": 6692,
8-
"total": 15638,
9-
"total_gz": 9483
8+
"total": 15701,
9+
"total_gz": 9498
1010
}

‎test/code_size/hello_webgl2_wasm2js.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 567,
33
"a.html.gz": 379,
4-
"a.js": 17917,
5-
"a.js.gz": 8089,
4+
"a.js": 17985,
5+
"a.js.gz": 8109,
66
"a.mem": 3123,
77
"a.mem.gz": 2693,
8-
"total": 21607,
9-
"total_gz": 11161
8+
"total": 21675,
9+
"total_gz": 11181
1010
}

‎test/code_size/hello_webgl_wasm.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 569,
33
"a.html.gz": 379,
4-
"a.js": 4167,
5-
"a.js.gz": 2236,
4+
"a.js": 4251,
5+
"a.js.gz": 2258,
66
"a.wasm": 10388,
77
"a.wasm.gz": 6692,
8-
"total": 15124,
9-
"total_gz": 9307
8+
"total": 15208,
9+
"total_gz": 9329
1010
}

‎test/code_size/hello_webgl_wasm2js.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 567,
33
"a.html.gz": 379,
4-
"a.js": 17395,
5-
"a.js.gz": 7900,
4+
"a.js": 17483,
5+
"a.js.gz": 7931,
66
"a.mem": 3123,
77
"a.mem.gz": 2693,
8-
"total": 21085,
9-
"total_gz": 10972
8+
"total": 21173,
9+
"total_gz": 11003
1010
}

‎test/float_tex.cpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
#include <cmath>
1010
#include <iostream>
1111
#include <vector>
12-
extern "C" {
1312
#include <GL/gl.h>
1413
#include <GL/glut.h>
15-
}
14+
1615
static const char vertex_shader[] =
1716
"#ifdef GL_ES\n"
1817
"precision lowp float;\n"
@@ -44,6 +43,7 @@ static const char fragment_shader[] =
4443
"}\n"
4544
"if ( dst > 0.5) discard;\n"
4645
"}";
46+
4747
struct NodeInfo { //structure that we want to transmit to our shaders
4848
float x;
4949
float y;
@@ -55,8 +55,9 @@ GLuint nodeSamplerLocation; //shader sampler address
5555
GLuint indicesAttributeLocation; //shader attribute address
5656
GLuint indicesVBO; //Vertex Buffer Object Id;
5757
const int nbNodes = 512;
58-
NodeInfo * data = new NodeInfo[nbNodes]; //our data that will be transmitted using float texture.
58+
NodeInfo data[nbNodes]; //our data that will be transmitted using float texture.
5959
double alpha = 0; //use to make a simple funny effect;
60+
6061
static void updateFloatTexture() {
6162
int count = 0;
6263
for (float x=0; x < nbNodes; ++x ) {
@@ -79,7 +80,9 @@ static void updateFloatTexture() {
7980
glBindTexture(GL_TEXTURE_2D, 0);
8081
alpha -= 0.001;
8182
}
83+
8284
static void glut_draw_callback(void) {
85+
printf("glut_draw_callback\n");
8386
glDisable(GL_CULL_FACE);
8487
glDisable(GL_DEPTH_TEST);
8588
glEnable(GL_BLEND);
@@ -96,6 +99,7 @@ static void glut_draw_callback(void) {
9699
glDrawArrays(GL_POINTS, 0, nbNodes);
97100
glutSwapBuffers();
98101
}
102+
99103
GLuint createShader(const char source[], int type) {
100104
GLint status;
101105
char msg[512];
@@ -110,6 +114,7 @@ GLuint createShader(const char source[], int type) {
110114
assert(status == GL_TRUE);
111115
return shader;
112116
}
117+
113118
static void gl_init(void) {
114119
GLuint program = glCreateProgram();
115120
glAttachShader(program, createShader(vertex_shader , GL_VERTEX_SHADER));
@@ -145,6 +150,7 @@ static void gl_init(void) {
145150
glEnable(GL_POINT_SPRITE);
146151
#endif
147152
}
153+
148154
int main(int argc, char *argv[]) {
149155
glutInit(&argc, argv);
150156
glutInitWindowSize(640, 480);
@@ -153,6 +159,7 @@ int main(int argc, char *argv[]) {
153159
/* Set up glut callback functions */
154160
glutDisplayFunc(glut_draw_callback );
155161
gl_init();
162+
printf("done setup\n");
156163
glutMainLoop();
157164
return 0;
158165
}

0 commit comments

Comments
 (0)