[Bf-blender-cvs] [f8a1255] pbr-viewport: Fix left over from merge
Dalai Felinto
noreply at git.blender.org
Tue Nov 1 22:01:39 CET 2016
Commit: f8a1255464951af1c720d1d928314827b46e2c98
Author: Dalai Felinto
Date: Tue Nov 1 22:00:47 2016 +0100
Branches: pbr-viewport
https://developer.blender.org/rBf8a1255464951af1c720d1d928314827b46e2c98
Fix left over from merge
Linux did not mind with them, but luckily Linux is more strict
===================================================================
M source/blender/gpu/intern/gpu_framebuffer.c
M source/blender/gpu/intern/gpu_pbr.c
M source/blender/gpu/intern/gpu_probe.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index 5aa7641..5201e9b 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -442,7 +442,7 @@ void GPU_framebuffer_hiz_construction(GPUFrameBuffer* fb, GPUTexture *tex, const
lowermip_uniform = GPU_shader_get_uniform(shader, "lowermip");
lowermipsize_uniform = GPU_shader_get_uniform(shader, "lowermipsize");
- GPU_framebuffer_texture_attach(fb, tex, 0, NULL);
+ GPU_framebuffer_texture_attach(fb, tex, 0);
GPU_texture_bind_as_framebuffer(tex);
bindcode = GPU_texture_opengl_bindcode(tex);
diff --git a/source/blender/gpu/intern/gpu_pbr.c b/source/blender/gpu/intern/gpu_pbr.c
index de22739..c0330ad 100644
--- a/source/blender/gpu/intern/gpu_pbr.c
+++ b/source/blender/gpu/intern/gpu_pbr.c
@@ -103,7 +103,7 @@ static GPUScreenBuffer *gpu_scenebuf_create(int width, int height, bool depth_on
return NULL;
}
- if (!GPU_framebuffer_texture_attach(buf->fb, buf->tex, 0, NULL)) {
+ if (!GPU_framebuffer_texture_attach(buf->fb, buf->tex, 0)) {
GPU_scenebuf_free(buf);
return NULL;
}
@@ -121,7 +121,7 @@ static GPUScreenBuffer *gpu_scenebuf_create(int width, int height, bool depth_on
return NULL;
}
- if (!GPU_framebuffer_texture_attach(buf->fb, buf->depth, 0, NULL)) {
+ if (!GPU_framebuffer_texture_attach(buf->fb, buf->depth, 0)) {
GPU_scenebuf_free(buf);
return NULL;
}
@@ -132,7 +132,7 @@ static GPUScreenBuffer *gpu_scenebuf_create(int width, int height, bool depth_on
return NULL;
}
- if (!GPU_framebuffer_texture_attach(buf->fb, buf->tex, 0, NULL)) {
+ if (!GPU_framebuffer_texture_attach(buf->fb, buf->tex, 0)) {
GPU_scenebuf_free(buf);
return NULL;
}
@@ -222,14 +222,14 @@ void GPU_scenebuf_filter_texture(GPUScreenBuffer* buf)
GPU_generate_mipmap(GL_TEXTURE_2D);
GPU_texture_unbind(buf->depth);
GPU_framebuffer_hiz_construction(buf->downsamplingfb, buf->depth, false);
- GPU_framebuffer_texture_attach(buf->fb, buf->depth, 0, NULL);
+ GPU_framebuffer_texture_attach(buf->fb, buf->depth, 0);
}
else {
GPU_texture_bind(buf->tex, 0);
GPU_generate_mipmap(GL_TEXTURE_2D);
GPU_texture_unbind(buf->tex);
GPU_framebuffer_hiz_construction(buf->downsamplingfb, buf->tex, true);
- GPU_framebuffer_texture_attach(buf->fb, buf->tex, 0, NULL);
+ GPU_framebuffer_texture_attach(buf->fb, buf->tex, 0);
}
GPU_framebuffer_restore();
diff --git a/source/blender/gpu/intern/gpu_probe.c b/source/blender/gpu/intern/gpu_probe.c
index e1f5583..23e2ecd 100644
--- a/source/blender/gpu/intern/gpu_probe.c
+++ b/source/blender/gpu/intern/gpu_probe.c
@@ -152,7 +152,7 @@ static void gpu_probe_from_blender(Scene *scene, World *wo, Object *ob, GPUProbe
return;
}
- if (!GPU_framebuffer_cubeface_attach(probe->fb, probe->tex, 0, 0, NULL)) {
+ if (!GPU_framebuffer_cubeface_attach(probe->fb, probe->tex, 0, 0)) {
gpu_probe_buffers_free(probe);
return;
}
@@ -164,7 +164,7 @@ static void gpu_probe_from_blender(Scene *scene, World *wo, Object *ob, GPUProbe
return;
}
- if (!GPU_framebuffer_texture_attach(probe->fb, probe->depthtex, 0, NULL)) {
+ if (!GPU_framebuffer_texture_attach(probe->fb, probe->depthtex, 0)) {
gpu_probe_buffers_free(probe);
return;
}
@@ -188,7 +188,7 @@ static void gpu_probe_from_blender(Scene *scene, World *wo, Object *ob, GPUProbe
return;
}
- if (!GPU_framebuffer_texture_attach(probe->fbsh, probe->shtex, 0, NULL)) {
+ if (!GPU_framebuffer_texture_attach(probe->fbsh, probe->shtex, 0)) {
gpu_probe_buffers_free(probe);
return;
}
@@ -218,7 +218,7 @@ static void gpu_probe_from_blender(Scene *scene, World *wo, Object *ob, GPUProbe
return;
}
- if (!GPU_framebuffer_texture_attach(probe->fb, probe->texrefract, 0, NULL)) {
+ if (!GPU_framebuffer_texture_attach(probe->fb, probe->texrefract, 0)) {
gpu_probe_buffers_free(probe);
return;
}
@@ -232,7 +232,7 @@ static void gpu_probe_from_blender(Scene *scene, World *wo, Object *ob, GPUProbe
return;
}
- if (!GPU_framebuffer_texture_attach(probe->fb, probe->texreflect, 0, NULL)) {
+ if (!GPU_framebuffer_texture_attach(probe->fb, probe->texreflect, 0)) {
gpu_probe_buffers_free(probe);
return;
}
@@ -244,7 +244,7 @@ static void gpu_probe_from_blender(Scene *scene, World *wo, Object *ob, GPUProbe
return;
}
- if (!GPU_framebuffer_texture_attach(probe->fb, probe->depthtex, 0, NULL)) {
+ if (!GPU_framebuffer_texture_attach(probe->fb, probe->depthtex, 0)) {
gpu_probe_buffers_free(probe);
return;
}
@@ -377,7 +377,7 @@ void GPU_probe_buffer_bind(GPUProbe *probe)
void GPU_probe_switch_fb_cubeface(GPUProbe *probe, int cubeface, float viewmat[4][4], int *winsize, float winmat[4][4])
{
gpu_probe_cube_update_buffer_mats(probe, cubeface);
- GPU_framebuffer_cubeface_attach(probe->fb, probe->tex, 0, cubeface, NULL);
+ GPU_framebuffer_cubeface_attach(probe->fb, probe->tex, 0, cubeface);
/* set matrices */
copy_m4_m4(viewmat, probe->viewmat);
@@ -398,9 +398,9 @@ void GPU_probe_attach_planar_fb(GPUProbe *probe, float camviewmat[4][4], float c
float plane[4] = {0.0f, 0.0f, -1.0f, 0.0f};
if (refraction)
- GPU_framebuffer_texture_attach(probe->fb, probe->texrefract, 0, NULL);
+ GPU_framebuffer_texture_attach(probe->fb, probe->texrefract, 0);
else
- GPU_framebuffer_texture_attach(probe->fb, probe->texreflect, 0, NULL);
+ GPU_framebuffer_texture_attach(probe->fb, probe->texreflect, 0);
/* opengl buffer is range 0.0..1.0 instead of -1.0..1.0 in blender */
unit_m4(rangemat);
@@ -585,7 +585,7 @@ void GPU_probe_update_ref_plane(GPUProbe *probe, float obmat[4][4])
/* Spherical Harmonics : Diffuse lighting */
-void gpu_compute_sh(GPUProbe *probe)
+static void gpu_compute_sh(GPUProbe *probe)
{
int probe_source_uniform;
GPUShader *sh_shader = GPU_shader_get_builtin_shader(GPU_SHADER_COMPUTE_SH + probe->shres);
More information about the Bf-blender-cvs
mailing list