Skip to content

Commit d81175a

Browse files
committed
- glPixelStore() before glReadPixels(): set alignment to 1 (instead of
default 4) - silence clang warnings for TinyBVH
1 parent a25d163 commit d81175a

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

plugins/OGF/RayTracing/shaders/mesh_grob_ray_tracing_shader.cpp

+13
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,24 @@
6060

6161
#ifdef __GNUC__
6262
#ifndef __ICC
63+
6364
#pragma GCC diagnostic push
65+
6466
#pragma GCC diagnostic ignored "-Wsign-conversion"
6567
#pragma GCC diagnostic ignored "-Wdouble-promotion"
6668
#pragma GCC diagnostic ignored "-Wconversion"
6769
#pragma GCC diagnostic ignored "-Wpedantic"
6870
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
71+
72+
#ifdef __clang__
73+
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer"
74+
#pragma GCC diagnostic ignored "-Wcomma"
75+
#pragma GCC diagnostic ignored "-Wcast-qual"
6976
#endif
77+
7078
#endif
79+
#endif
80+
7181

7282
#define TINYBVH_IMPLEMENTATION
7383
#include <OGF/RayTracing/third_party/tiny_bvh.h>
@@ -322,6 +332,9 @@ namespace OGF {
322332
);
323333
}
324334

335+
glPixelStorei(GL_UNPACK_ALIGNMENT,1);
336+
glPixelStorei(GL_PACK_ALIGNMENT,1);
337+
325338
glReadPixels(
326339
0, 0,
327340
GLsizei(w), GLsizei(h),

0 commit comments

Comments
 (0)