Bug fixes

angeluriot · Sep 11, 2023 · 7e23e32 · 7e23e32
1 parent 6a510e3
commit 7e23e32
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/libraries/Dimension3D b/libraries/Dimension3D
diff --git a/libraries/GLEW b/libraries/GLEW
diff --git a/libraries/GLM b/libraries/GLM
diff --git a/shaders/compute/cl_compute_shader.cl b/shaders/compute/cl_compute_shader.cl
@@ -112,7 +112,7 @@ real2_t square(real2_t z)
 	return multiply(z, z);
 }
 
-float4 get_color(float iterations, float max_iterations, float4* pallet, int colors_nb)
+float4 get_color(float iterations, float max_iterations, __global float4* pallet, int colors_nb)
 {
 	float value = iterations / max_iterations;
 	float4 color = (float4)(1.f, 1.f, 1.f, 1.f);
@@ -278,7 +278,7 @@ __kernel void burning_ship(__global float4* pixels, int max_iterations, real_t p
 	pixels[get_global_id(1) * get_global_size(0) + get_global_id(0)] = color;
 }
 
-void set_pixel(float4* pixels, int2 pos, int2 screen_size, int i, int max_iterations, int nb_points, float brightness)
+void set_pixel(__global float4* pixels, int2 pos, int2 screen_size, int i, int max_iterations, int nb_points, float brightness)
 {
 	if (pos.x >= 0 && pos.x < screen_size.x && pos.y >= 0 && pos.y < screen_size.y)
 	{

diff --git a/shaders/post.frag b/shaders/post.frag
@@ -9,5 +9,5 @@ uniform sampler2D u_texture;
 
 void main()
 {
-	frag_color = texture2D(u_texture, v_texcoord);
+	frag_color = texture(u_texture, v_texcoord);
 }
+2 −2		README.md
+1 −1		includes/dim/controllers/Controller.hpp
+23 −0		includes/dim/objects/Mesh.hpp
+23 −11		includes/dim/opengl/FrameBuffer.hpp
+14 −4		includes/dim/opengl/VertexBuffer.hpp
+0 −2		sources/controllers/Controller.cpp
+73 −1		sources/objects/Mesh.cpp
+2 −0		sources/objects/Object.cpp
+36 −24		sources/opengl/FrameBuffer.cpp
+1 −1		sources/opengl/Shader.cpp
+34 −4		sources/opengl/VertexBuffer.cpp
+3 −0		.gitignore
+42 −17		CMakeLists.txt
+2 −3		README_glew.md
+3 −2		auto/bin/filter_gl_ext.sh
+1 −1		auto/bin/make.pl
+7 −3		auto/bin/parse_spec.pl
+1 −1		auto/doc/advanced.html
+3 −3		auto/doc/log.html
+3 −3		auto/src/glew.rc
+5 −5		auto/src/glew_head.c
+0 −5		auto/src/glew_head.h
+3 −3		auto/src/glewinfo.rc
+3 −3		auto/src/visualinfo.rc
+27 −16		build/cmake/CMakeLists.txt
+1 −1		build/cmake/testbuild/CMakeLists.txt
+3 −3		build/glew.rc
+3 −3		build/glewinfo.rc
+3 −3		build/visualinfo.rc
+3 −3		config/Makefile.darwin-universal
+382 −168		config/config.guess
+1 −1		doc/advanced.html
+592 −587		doc/glew.html
+3 −3		doc/log.html
+3 −2		glew-cmake/maintain.sh
+62 −2		include/GL/eglew.h
+84 −6		include/GL/glew.h
+182 −6		src/glew.c
+130 −1		src/glewinfo.c