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

Fix #34649: texture size limit user preference not working.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-03-15 16:16:11 +00:00
parent 630798ba3c
commit bcec00dddc
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/gpu/intern/gpu_draw.c
View File

@@ -189,30 +189,21 @@ void GPU_render_text(MTFace *tface, int mode,
/* Checking powers of two for images since opengl 1.x requires it */ /* Checking powers of two for images since opengl 1.x requires it */
static int is_pow2_limit(int num) static bool is_power_of_2_resolution(int w, int h)
{ {
/* take texture clamping into account */ return is_power_of_2_i(w) && is_power_of_2_i(h);
/* XXX: texturepaint not global! */
#if 0
if (G.f & G_TEXTUREPAINT)
return 1;*/
#endif
if (U.glreslimit != 0 && num > U.glreslimit)
return 0;
return is_power_of_2_i(num);
} }
static int smaller_pow2_limit(int num) static bool is_over_resolution_limit(int w, int h)
{ {
/* XXX: texturepaint not global! */ if (U.glreslimit != 0)
#if 0 return (w > U.glreslimit || h > U.glreslimit);
if (G.f & G_TEXTUREPAINT)
return 1;*/
#endif
return false;
}
static int smaller_power_of_2_limit(int num)
{
/* take texture clamping into account */ /* take texture clamping into account */
if (U.glreslimit != 0 && num > U.glreslimit) if (U.glreslimit != 0 && num > U.glreslimit)
return U.glreslimit; return U.glreslimit;
@@ -681,9 +672,10 @@ void GPU_create_gl_tex(unsigned int *bind, unsigned int *pix, float *frect, int
/* scale if not a power of two. this is not strictly necessary for newer /* scale if not a power of two. this is not strictly necessary for newer
* GPUs (OpenGL version >= 2.0) since they support non-power-of-two-textures * GPUs (OpenGL version >= 2.0) since they support non-power-of-two-textures
* Then don't bother scaling for hardware that supports NPOT textures! */ * Then don't bother scaling for hardware that supports NPOT textures! */
if (!GPU_non_power_of_two_support() && (!is_pow2_limit(rectw) || !is_pow2_limit(recth))) { if ((!GPU_non_power_of_two_support() && !is_power_of_2_resolution(rectw, recth)) ||
rectw= smaller_pow2_limit(rectw); is_over_resolution_limit(rectw, recth)) {
recth= smaller_pow2_limit(recth); rectw= smaller_power_of_2_limit(rectw);
recth= smaller_power_of_2_limit(recth);
if (use_high_bit_depth) { if (use_high_bit_depth) {
fscalerect= MEM_mallocN(rectw*recth*sizeof(*fscalerect)*4, "fscalerect"); fscalerect= MEM_mallocN(rectw*recth*sizeof(*fscalerect)*4, "fscalerect");
@@ -772,7 +764,7 @@ int GPU_upload_dxt_texture(ImBuf *ibuf)
return FALSE; return FALSE;
} }
if (!is_power_of_2_i(width) || !is_power_of_2_i(height)) { if (!is_power_of_2_resolution(width, height)) {
printf("Unable to load non-power-of-two DXT image resolution, falling back to uncompressed\n"); printf("Unable to load non-power-of-two DXT image resolution, falling back to uncompressed\n");
return FALSE; return FALSE;
} }