Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e7f22eb

Browse files
marxinmarxin
committedApr 2, 2019
Enable warnings=extra on clang and GCC testers.
And remove 2 warnings from warnings=extra.
1 parent 612a109 commit e7f22eb

14 files changed

+135
-124
lines changed
 

‎.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ matrix:
2727
packages:
2828
- clang-format-6.0
2929

30-
- env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no werror=yes"
30+
- env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes"
3131
os: linux
3232
compiler: gcc-8
3333
addons:
@@ -49,15 +49,15 @@ matrix:
4949
build_command: "scons p=x11 -j2 $OPTIONS"
5050
branch_pattern: coverity_scan
5151

52-
- env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="werror=yes"
52+
- env: PLATFORM=x11 TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
5353
os: linux
5454
compiler: clang
5555
addons:
5656
apt:
5757
packages:
5858
- *linux_deps
5959

60-
- env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="werror=yes"
60+
- env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
6161
os: linux
6262
compiler: clang
6363

@@ -69,7 +69,7 @@ matrix:
6969
os: osx
7070
compiler: clang
7171

72-
- env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="werror=yes"
72+
- env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="warnings=extra werror=yes"
7373
os: linux
7474
compiler: gcc-8
7575
addons:

‎SConstruct

+6-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,12 @@ if selected_platform in platform_list:
347347
if version != None and version[0] >= '7':
348348
shadow_local_warning = ['-Wshadow-local']
349349
if (env["warnings"] == 'extra'):
350-
env.Append(CCFLAGS=['-Wall', '-Wextra'] + all_plus_warnings + shadow_local_warning)
350+
# FIXME: enable -Wimplicit-fallthrough once #26135 is fixed
351+
# FIXME: enable -Wclobbered once #26351 is fixed
352+
env.Append(CCFLAGS=['-Wall', '-Wextra', '-Wno-implicit-fallthrough', '-Wno-unused-parameter'] + all_plus_warnings + shadow_local_warning)
353+
if methods.use_gcc(env):
354+
env['CCFLAGS'] += ['-Wno-clobbered']
355+
351356
elif (env["warnings"] == 'all'):
352357
env.Append(CCFLAGS=['-Wall'] + shadow_local_warning)
353358
elif (env["warnings"] == 'moderate'):

‎core/bind/core_bind.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ Dictionary _OS::get_datetime_from_unix_time(int64_t unix_time_val) const {
792792

793793
size_t imonth = 0;
794794

795-
while (dayno >= MONTH_DAYS_TABLE[LEAPYEAR(year)][imonth]) {
795+
while ((unsigned long)dayno >= MONTH_DAYS_TABLE[LEAPYEAR(year)][imonth]) {
796796
dayno -= MONTH_DAYS_TABLE[LEAPYEAR(year)][imonth];
797797
imonth++;
798798
}

‎core/io/file_access_pack.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ int FileAccessPack::get_buffer(uint8_t *p_dst, int p_length) const {
272272
if (eof)
273273
return 0;
274274

275-
int64_t to_read = p_length;
275+
uint64_t to_read = p_length;
276276
if (to_read + pos > pf.size) {
277277
eof = true;
278278
to_read = int64_t(pf.size) - int64_t(pos);

‎core/typedefs.h

+6
Original file line numberDiff line numberDiff line change
@@ -328,4 +328,10 @@ struct _GlobalLock {
328328
#define _PRINTF_FORMAT_ATTRIBUTE_2_3
329329
#endif
330330

331+
/** This is needed due to a strange OpenGL API that expects a pointer
332+
* type for an argument that is actually an offset.
333+
*/
334+
335+
#define CAST_INT_TO_UCHAR_PTR(ptr) ((uint8_t *)(uintptr_t)(ptr))
336+
331337
#endif // TYPEDEFS_H

‎drivers/gles2/rasterizer_canvas_gles2.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -288,14 +288,14 @@ void RasterizerCanvasGLES2::_draw_polygon(const int *p_indices, int p_index_coun
288288
} else {
289289
glBufferSubData(GL_ARRAY_BUFFER, buffer_ofs, sizeof(Color) * p_vertex_count, p_colors);
290290
glEnableVertexAttribArray(VS::ARRAY_COLOR);
291-
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(Color), ((uint8_t *)0) + buffer_ofs);
291+
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(Color), CAST_INT_TO_UCHAR_PTR(buffer_ofs));
292292
buffer_ofs += sizeof(Color) * p_vertex_count;
293293
}
294294

295295
if (p_uvs) {
296296
glBufferSubData(GL_ARRAY_BUFFER, buffer_ofs, sizeof(Vector2) * p_vertex_count, p_uvs);
297297
glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
298-
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), ((uint8_t *)0) + buffer_ofs);
298+
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), CAST_INT_TO_UCHAR_PTR(buffer_ofs));
299299
buffer_ofs += sizeof(Vector2) * p_vertex_count;
300300
} else {
301301
glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
@@ -304,12 +304,12 @@ void RasterizerCanvasGLES2::_draw_polygon(const int *p_indices, int p_index_coun
304304
if (p_weights && p_bones) {
305305
glBufferSubData(GL_ARRAY_BUFFER, buffer_ofs, sizeof(float) * 4 * p_vertex_count, p_weights);
306306
glEnableVertexAttribArray(VS::ARRAY_WEIGHTS);
307-
glVertexAttribPointer(VS::ARRAY_WEIGHTS, 4, GL_FLOAT, GL_FALSE, sizeof(float) * 4, ((uint8_t *)0) + buffer_ofs);
307+
glVertexAttribPointer(VS::ARRAY_WEIGHTS, 4, GL_FLOAT, GL_FALSE, sizeof(float) * 4, CAST_INT_TO_UCHAR_PTR(buffer_ofs));
308308
buffer_ofs += sizeof(float) * 4 * p_vertex_count;
309309

310310
glBufferSubData(GL_ARRAY_BUFFER, buffer_ofs, sizeof(int) * 4 * p_vertex_count, p_bones);
311311
glEnableVertexAttribArray(VS::ARRAY_BONES);
312-
glVertexAttribPointer(VS::ARRAY_BONES, 4, GL_UNSIGNED_INT, GL_FALSE, sizeof(int) * 4, ((uint8_t *)0) + buffer_ofs);
312+
glVertexAttribPointer(VS::ARRAY_BONES, 4, GL_UNSIGNED_INT, GL_FALSE, sizeof(int) * 4, CAST_INT_TO_UCHAR_PTR(buffer_ofs));
313313
buffer_ofs += sizeof(int) * 4 * p_vertex_count;
314314

315315
} else {
@@ -342,7 +342,7 @@ void RasterizerCanvasGLES2::_draw_generic(GLuint p_primitive, int p_vertex_count
342342

343343
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(Vector2) * p_vertex_count, p_vertices);
344344
glEnableVertexAttribArray(VS::ARRAY_VERTEX);
345-
glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), (uint8_t *)0);
345+
glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), NULL);
346346
buffer_ofs += sizeof(Vector2) * p_vertex_count;
347347

348348
if (p_singlecolor) {
@@ -355,14 +355,14 @@ void RasterizerCanvasGLES2::_draw_generic(GLuint p_primitive, int p_vertex_count
355355
} else {
356356
glBufferSubData(GL_ARRAY_BUFFER, buffer_ofs, sizeof(Color) * p_vertex_count, p_colors);
357357
glEnableVertexAttribArray(VS::ARRAY_COLOR);
358-
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(Color), ((uint8_t *)0) + buffer_ofs);
358+
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(Color), CAST_INT_TO_UCHAR_PTR(buffer_ofs));
359359
buffer_ofs += sizeof(Color) * p_vertex_count;
360360
}
361361

362362
if (p_uvs) {
363363
glBufferSubData(GL_ARRAY_BUFFER, buffer_ofs, sizeof(Vector2) * p_vertex_count, p_uvs);
364364
glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
365-
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), ((uint8_t *)0) + buffer_ofs);
365+
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), CAST_INT_TO_UCHAR_PTR(buffer_ofs));
366366
} else {
367367
glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
368368
}
@@ -419,12 +419,12 @@ void RasterizerCanvasGLES2::_draw_gui_primitive(int p_points, const Vector2 *p_v
419419
glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, stride * sizeof(float), NULL);
420420

421421
if (p_colors) {
422-
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, stride * sizeof(float), (uint8_t *)0 + color_offset * sizeof(float));
422+
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(color_offset * sizeof(float)));
423423
glEnableVertexAttribArray(VS::ARRAY_COLOR);
424424
}
425425

426426
if (p_uvs) {
427-
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, stride * sizeof(float), (uint8_t *)0 + uv_offset * sizeof(float));
427+
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, stride * sizeof(float), CAST_INT_TO_UCHAR_PTR(uv_offset * sizeof(float)));
428428
glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
429429
}
430430

@@ -840,7 +840,7 @@ void RasterizerCanvasGLES2::_canvas_item_render_commands(Item *p_item, Item *cur
840840
glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
841841

842842
glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), NULL);
843-
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (uint8_t *)0 + (sizeof(float) * 2));
843+
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), CAST_INT_TO_UCHAR_PTR((sizeof(float) * 2)));
844844

845845
glDrawElements(GL_TRIANGLES, 18 * 3 - (np->draw_center ? 0 : 6), GL_UNSIGNED_BYTE, NULL);
846846

@@ -932,7 +932,7 @@ void RasterizerCanvasGLES2::_canvas_item_render_commands(Item *p_item, Item *cur
932932
for (int k = 0; k < VS::ARRAY_MAX - 1; k++) {
933933
if (s->attribs[k].enabled) {
934934
glEnableVertexAttribArray(k);
935-
glVertexAttribPointer(s->attribs[k].index, s->attribs[k].size, s->attribs[k].type, s->attribs[k].normalized, s->attribs[k].stride, (uint8_t *)0 + s->attribs[k].offset);
935+
glVertexAttribPointer(s->attribs[k].index, s->attribs[k].size, s->attribs[k].type, s->attribs[k].normalized, s->attribs[k].stride, CAST_INT_TO_UCHAR_PTR(s->attribs[k].offset));
936936
} else {
937937
glDisableVertexAttribArray(k);
938938
switch (k) {
@@ -1021,7 +1021,7 @@ void RasterizerCanvasGLES2::_canvas_item_render_commands(Item *p_item, Item *cur
10211021
for (int k = 0; k < VS::ARRAY_MAX - 1; k++) {
10221022
if (s->attribs[k].enabled) {
10231023
glEnableVertexAttribArray(k);
1024-
glVertexAttribPointer(s->attribs[k].index, s->attribs[k].size, s->attribs[k].type, s->attribs[k].normalized, s->attribs[k].stride, (uint8_t *)0 + s->attribs[k].offset);
1024+
glVertexAttribPointer(s->attribs[k].index, s->attribs[k].size, s->attribs[k].type, s->attribs[k].normalized, s->attribs[k].stride, CAST_INT_TO_UCHAR_PTR(s->attribs[k].offset));
10251025
} else {
10261026
glDisableVertexAttribArray(k);
10271027
switch (k) {

‎drivers/gles2/rasterizer_scene_gles2.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ void RasterizerSceneGLES2::_setup_geometry(RenderList::Element *p_element, Raste
13581358
for (int i = 0; i < VS::ARRAY_MAX - 1; i++) {
13591359
if (s->attribs[i].enabled) {
13601360
glEnableVertexAttribArray(i);
1361-
glVertexAttribPointer(s->attribs[i].index, s->attribs[i].size, s->attribs[i].type, s->attribs[i].normalized, s->attribs[i].stride, (uint8_t *)0 + s->attribs[i].offset);
1361+
glVertexAttribPointer(s->attribs[i].index, s->attribs[i].size, s->attribs[i].type, s->attribs[i].normalized, s->attribs[i].stride, CAST_INT_TO_UCHAR_PTR(s->attribs[i].offset));
13621362
} else {
13631363
glDisableVertexAttribArray(i);
13641364
switch (i) {
@@ -1519,7 +1519,7 @@ void RasterizerSceneGLES2::_setup_geometry(RenderList::Element *p_element, Raste
15191519
for (int i = 0; i < VS::ARRAY_MAX - 1; i++) {
15201520
if (s->attribs[i].enabled) {
15211521
glEnableVertexAttribArray(i);
1522-
glVertexAttribPointer(s->attribs[i].index, s->attribs[i].size, s->attribs[i].type, s->attribs[i].normalized, s->attribs[i].stride, (uint8_t *)0 + s->attribs[i].offset);
1522+
glVertexAttribPointer(s->attribs[i].index, s->attribs[i].size, s->attribs[i].type, s->attribs[i].normalized, s->attribs[i].stride, CAST_INT_TO_UCHAR_PTR(s->attribs[i].offset));
15231523
} else {
15241524
glDisableVertexAttribArray(i);
15251525
switch (i) {
@@ -1698,7 +1698,7 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) {
16981698
if (!c.normals.empty()) {
16991699
glEnableVertexAttribArray(VS::ARRAY_NORMAL);
17001700
glBufferSubData(GL_ARRAY_BUFFER, buf_ofs, sizeof(Vector3) * vertices, c.normals.ptr());
1701-
glVertexAttribPointer(VS::ARRAY_NORMAL, 3, GL_FLOAT, GL_FALSE, sizeof(Vector3), ((uint8_t *)NULL) + buf_ofs);
1701+
glVertexAttribPointer(VS::ARRAY_NORMAL, 3, GL_FLOAT, GL_FALSE, sizeof(Vector3), CAST_INT_TO_UCHAR_PTR(buf_ofs));
17021702
buf_ofs += sizeof(Vector3) * vertices;
17031703
} else {
17041704
glDisableVertexAttribArray(VS::ARRAY_NORMAL);
@@ -1707,7 +1707,7 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) {
17071707
if (!c.tangents.empty()) {
17081708
glEnableVertexAttribArray(VS::ARRAY_TANGENT);
17091709
glBufferSubData(GL_ARRAY_BUFFER, buf_ofs, sizeof(Plane) * vertices, c.tangents.ptr());
1710-
glVertexAttribPointer(VS::ARRAY_TANGENT, 4, GL_FLOAT, GL_FALSE, sizeof(Plane), ((uint8_t *)NULL) + buf_ofs);
1710+
glVertexAttribPointer(VS::ARRAY_TANGENT, 4, GL_FLOAT, GL_FALSE, sizeof(Plane), CAST_INT_TO_UCHAR_PTR(buf_ofs));
17111711
buf_ofs += sizeof(Plane) * vertices;
17121712
} else {
17131713
glDisableVertexAttribArray(VS::ARRAY_TANGENT);
@@ -1716,7 +1716,7 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) {
17161716
if (!c.colors.empty()) {
17171717
glEnableVertexAttribArray(VS::ARRAY_COLOR);
17181718
glBufferSubData(GL_ARRAY_BUFFER, buf_ofs, sizeof(Color) * vertices, c.colors.ptr());
1719-
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(Color), ((uint8_t *)NULL) + buf_ofs);
1719+
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, GL_FALSE, sizeof(Color), CAST_INT_TO_UCHAR_PTR(buf_ofs));
17201720
buf_ofs += sizeof(Color) * vertices;
17211721
} else {
17221722
glDisableVertexAttribArray(VS::ARRAY_COLOR);
@@ -1725,7 +1725,7 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) {
17251725
if (!c.uvs.empty()) {
17261726
glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
17271727
glBufferSubData(GL_ARRAY_BUFFER, buf_ofs, sizeof(Vector2) * vertices, c.uvs.ptr());
1728-
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), ((uint8_t *)NULL) + buf_ofs);
1728+
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), CAST_INT_TO_UCHAR_PTR(buf_ofs));
17291729
buf_ofs += sizeof(Vector2) * vertices;
17301730
} else {
17311731
glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
@@ -1734,15 +1734,15 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) {
17341734
if (!c.uv2s.empty()) {
17351735
glEnableVertexAttribArray(VS::ARRAY_TEX_UV2);
17361736
glBufferSubData(GL_ARRAY_BUFFER, buf_ofs, sizeof(Vector2) * vertices, c.uv2s.ptr());
1737-
glVertexAttribPointer(VS::ARRAY_TEX_UV2, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), ((uint8_t *)NULL) + buf_ofs);
1737+
glVertexAttribPointer(VS::ARRAY_TEX_UV2, 2, GL_FLOAT, GL_FALSE, sizeof(Vector2), CAST_INT_TO_UCHAR_PTR(buf_ofs));
17381738
buf_ofs += sizeof(Vector2) * vertices;
17391739
} else {
17401740
glDisableVertexAttribArray(VS::ARRAY_TEX_UV2);
17411741
}
17421742

17431743
glEnableVertexAttribArray(VS::ARRAY_VERTEX);
17441744
glBufferSubData(GL_ARRAY_BUFFER, buf_ofs, sizeof(Vector3) * vertices, c.vertices.ptr());
1745-
glVertexAttribPointer(VS::ARRAY_VERTEX, 3, GL_FLOAT, GL_FALSE, sizeof(Vector3), ((uint8_t *)NULL) + buf_ofs);
1745+
glVertexAttribPointer(VS::ARRAY_VERTEX, 3, GL_FLOAT, GL_FALSE, sizeof(Vector3), CAST_INT_TO_UCHAR_PTR(buf_ofs));
17461746

17471747
glDrawArrays(gl_primitive[c.primitive], 0, c.vertices.size());
17481748
}
@@ -2598,7 +2598,7 @@ void RasterizerSceneGLES2::_draw_sky(RasterizerStorageGLES2::Sky *p_sky, const C
25982598

25992599
// bind sky vertex array....
26002600
glVertexAttribPointer(VS::ARRAY_VERTEX, 3, GL_FLOAT, GL_FALSE, sizeof(Vector3) * 2, 0);
2601-
glVertexAttribPointer(VS::ARRAY_TEX_UV, 3, GL_FLOAT, GL_FALSE, sizeof(Vector3) * 2, ((uint8_t *)NULL) + sizeof(Vector3));
2601+
glVertexAttribPointer(VS::ARRAY_TEX_UV, 3, GL_FLOAT, GL_FALSE, sizeof(Vector3) * 2, CAST_INT_TO_UCHAR_PTR(sizeof(Vector3)));
26022602
glEnableVertexAttribArray(VS::ARRAY_VERTEX);
26032603
glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
26042604

‎drivers/gles2/rasterizer_storage_gles2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ GLuint RasterizerStorageGLES2::system_fbo = 0;
8484
void RasterizerStorageGLES2::bind_quad_array() const {
8585
glBindBuffer(GL_ARRAY_BUFFER, resources.quadie);
8686
glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, 0);
87-
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, ((uint8_t *)NULL) + 8);
87+
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, GL_FALSE, sizeof(float) * 4, CAST_INT_TO_UCHAR_PTR(8));
8888

8989
glEnableVertexAttribArray(VS::ARRAY_VERTEX);
9090
glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Please sign in to comment.