archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix ogl deprecated calls.

Browse Source
This commit is contained in:
Clément Foucault
2017-05-12 18:02:31 +02:00
parent 7d12d8956d
commit 1bcbad446e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/gpu/intern/gpu_texture.c
View File

@@ -504,7 +504,9 @@ static GPUTexture *GPU_texture_cube_create(
glTexParameteri(tex->target_base, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(tex->target_base, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(tex->target_base, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE); glTexParameteri(tex->target_base, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE);
glTexParameteri(tex->target_base, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL); glTexParameteri(tex->target_base, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
#ifdef WITH_LEGACY_OPENGL
glTexParameteri(tex->target_base, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY); glTexParameteri(tex->target_base, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY);
#endif
} }
else { else {
glTexParameteri(tex->target_base, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(tex->target_base, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -568,10 +570,16 @@ GPUTexture *GPU_texture_from_blender(Image *ima, ImageUser *iuser, int textarget
glBindTexture(textarget, tex->bindcode); glBindTexture(textarget, tex->bindcode);
glGetTexLevelParameteriv(gettarget, 0, GL_TEXTURE_WIDTH, &w); glGetTexLevelParameteriv(gettarget, 0, GL_TEXTURE_WIDTH, &w);
glGetTexLevelParameteriv(gettarget, 0, GL_TEXTURE_HEIGHT, &h); glGetTexLevelParameteriv(gettarget, 0, GL_TEXTURE_HEIGHT, &h);
#ifdef WITH_LEGACY_OPENGL
glGetTexLevelParameteriv(gettarget, 0, GL_TEXTURE_BORDER, &border); glGetTexLevelParameteriv(gettarget, 0, GL_TEXTURE_BORDER, &border);
tex->w = w - border; tex->w = w - border;
tex->h = h - border; tex->h = h - border;
#else
tex->w = w;
tex->h = h;
UNUSED_VARS(border);
#endif
} }
glBindTexture(textarget, 0); glBindTexture(textarget, 0);