[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46105] branches/soc-2011-tomato/source/ blender/editors/space_clip/clip_editor.c: Tomato: disable texture buffers for intel cards due to they' re constantly blinking with black frames
Sergey Sharybin
sergey.vfx at gmail.com
Mon Apr 30 12:04:20 CEST 2012
Revision: 46105
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46105
Author: nazgul
Date: 2012-04-30 10:04:20 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Tomato: disable texture buffers for intel cards due to they're constantly blinking with black frames
Also remove unused code.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c 2012-04-30 10:03:13 UTC (rev 46104)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c 2012-04-30 10:04:20 UTC (rev 46105)
@@ -486,7 +486,12 @@
if (!context->support_checked) {
context->support_checked = TRUE;
- context->buffers_supported = GPU_non_power_of_two_support();
+ if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_ANY, GPU_DRIVER_ANY)) {
+ context->buffers_supported = FALSE;
+ }
+ else {
+ context->buffers_supported = GPU_non_power_of_two_support();
+ }
}
return context->buffers_supported;
@@ -526,35 +531,6 @@
context->texture_allocated = 0;
}
-#if 0
- /* disabled for now because current tracking users have got NPOT textures
- * working smoothly on their computers and forcing re-scaling during playback
- * slows down playback a lot */
-
- /* if videocard doesn't support NPOT textures, need to do rescaling */
- if (!GPU_non_power_of_two_support()) {
- if (!is_power_of_2_i(width) || !is_power_of_2_i(height)) {
- width = power_of_2_max_i(width);
- height = power_of_2_max_i(height);
-
- if (ibuf->x != width || ibuf->y != height) {
- if (frect) {
- fscalerect= MEM_mallocN(width*width*sizeof(*fscalerect)*4, "fscalerect");
- gluScaleImage(GL_RGBA, ibuf->x, ibuf->y, GL_FLOAT, ibuf->rect_float, width, height, GL_FLOAT, fscalerect);
-
- frect = fscalerect;
- }
- else {
- scalerect= MEM_mallocN(width*height*sizeof(*scalerect), "scalerect");
- gluScaleImage(GL_RGBA, ibuf->x, ibuf->y, GL_UNSIGNED_BYTE, ibuf->rect, width, height, GL_UNSIGNED_BYTE, scalerect);
-
- rect = scalerect;
- }
- }
- }
- }
-#endif
-
if (need_recreate || !context->texture_allocated) {
/* texture doesn't exist yet or need to be re-allocated because of changed dimensions */
int filter = GL_LINEAR;
More information about the Bf-blender-cvs
mailing list