Commit Graph

167 Commits

Author SHA1 Message Date
Campbell Barton
cd2ab75b73 - include pthreads for win32 globally (as with opengl).
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)
2010-11-21 09:10:50 +00:00
Ton Roosendaal
aef3e99eab Bugfix #22052
OpenGL viewport render gave squeezed results in cases.
Reason: some graphics cards only give offscreen buffers in multiples
of 256 or 512 (my case). 

Current fix uses the actual size returned by graphics card, which
is also safe for too large renders.
More elaborate cropping or matching is for another time.

(Added printf for feedback on this, might disappear)
2010-11-18 19:11:05 +00:00
Mitchell Stokes
1bb98b4194 Adding monitoring for (approximate) VRAM used by textures. The information is currently only used in the profiling data of the BGE.
Here is a image of it in action:
http://www.pasteall.org/pic/show.php?id=6351

What it monitors:
  * VRAM used by textures created via bf_gpu and BL_Textures

What it does not monitor:
  * VRAM used by the Blender ui
  * VRAM used by 2d filters
  * VRAM allocated by the user via KX_Scene.pre_draw and KX_Scene.pre_draw
2010-11-17 05:28:25 +00:00
Campbell Barton
4661fb03a9 bugfix [#24704] UV editor: [x] modified does not update on change of modifiers
- VBO UV Edge display wasn't allocating a large enough array for drawing.
- VBO UV Edge drawing was using an edge flag with faces.
- notifier for modifiers updating the UV window.
2010-11-15 08:03:20 +00:00
Campbell Barton
369a5cc29e fix for compiling with the c90 standard, support for non-static variable initializers is a c99 feature. 2010-11-02 13:12:30 +00:00
Campbell Barton
3367ef8b65 initialize structs to zero rather then using memset(). 2010-10-31 15:39:37 +00:00
Campbell Barton
2777ba74b0 remove include paths which dont exist, fix for doc upload script which was getting the blender version twice and not working sometimes. 2010-10-27 13:52:12 +00:00
Campbell Barton
c6976e7351 use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
globbing vs explicit is discussed here.
http://www.cmake.org/pipermail/cmake/2008-December/025694.html

Practical implications are:
- developers need to keep CMakeLists.txt files up to date.
- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
2010-10-23 04:05:55 +00:00
Campbell Barton
97784a7186 fix for warnings & detecting opensource nouveau drivers. 2010-10-22 01:06:21 +00:00
Campbell Barton
e51bb1fb0e bugfix/workaround for ../../radeon/radeon_cs_gem.c:181: cs_gem_write_reloc: Assertion `boi->space_accounted' failed. [#656100]
reported on launchpad.

calling glClear(GL_COLOR_BUFFER_BIT); was crashing blender,
since this is only used to blank the window before its drawn, disable for opensource ATI drivers.
2010-10-22 00:29:56 +00:00
Campbell Barton
db09ca106d remove/tag unused args for view*.c, gpu*.c & image*.c 2010-10-15 12:29:02 +00:00
Campbell Barton
8a4fe62843 misc fixes found with clang's static checker. 2010-10-07 10:04:07 +00:00
Campbell Barton
a7258c9651 - fix for crash when drawing a subsurf after a modifier that lost original indices (bevel/screw/decimate)
- fix for own mistake used madd_v3_v3fl rather then mul_v3_v3fl, r32241.
2010-10-05 11:16:07 +00:00
Campbell Barton
db1b74654b - spec hardness was missing redraw update
- missed rna rename in image ui
- use BLI_math functions in gpu_draw.c (no functional changes)
2010-10-02 06:34:04 +00:00
Campbell Barton
677b9a194f need to set GL_SHININESS to the default value for weight painting. 2010-09-28 11:08:45 +00:00
Campbell Barton
dbd5524970 show material hardness in solid shaded mode 2010-09-27 07:01:08 +00:00
Campbell Barton
62c7786cd9 use a struct for fixed materials rather then float[2][4], easier to follow (no functional change) 2010-09-27 06:49:27 +00:00
Campbell Barton
dea59cc5eb warning fixes and minor cmake changes. 2010-09-18 03:55:56 +00:00
Campbell Barton
a992fec4e7 bugfix
- image filepath in the image view would only be set when first loading a frame.
- check to free animated image buffers on opengl render was comparing against the wrong value.
2010-08-25 02:32:02 +00:00
Benoit Bolsee
9b685a4b78 Fix quasy systematic crash at Blender exit: globalPool was released twice 2010-08-23 21:31:57 +00:00
Campbell Barton
d1759639dc - remove unused includes IMB_*, BIF_* & MEM_*
- remove MEM_guardedalloc.h from header files (include directly)
2010-08-16 05:46:10 +00:00
Brecht Van Lommel
60a8fc3759 Fix #23303: glsl color correction not working correct for image textures. 2010-08-15 09:34:18 +00:00
Guillermo S. Romero
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
Campbell Barton
9db1f87531 remove unused includes 2010-08-08 13:11:13 +00:00
Tom Musgrove
dc3c979ac8 after discussion with brecht reverting this commit, will pass on feedback to the patch author 2010-08-06 18:40:05 +00:00
Tom Musgrove
8c80f623f4 Committing Konrads GLSL preview of bumpmapping, now we no longer have the bizarre situation of being able to view the changes of the normal map but not of regular bump mapping 2010-08-06 17:42:47 +00:00
Tom Musgrove
e2f5f4fa53 removing the f so that glsl shaders work on older cards 2010-08-03 22:44:15 +00:00
Brecht Van Lommel
3b9b4f7605 Fix #23103:
* missing glsl update when changing color management setting
* disable glsl lamps only when disabling them for render
2010-07-30 10:44:00 +00:00
Brecht Van Lommel
3f06cab75e Fix #23073: glsl and 3d view background color didn't take color managment into
account yet, should now be consistent with render.
2010-07-29 10:09:20 +00:00
Brecht Van Lommel
c0ba0c1171 Fix #22986: glsl didn't take object hiding into account yet for lamps. 2010-07-27 11:10:34 +00:00
Brecht Van Lommel
f6ae7af243 2.5: automatic draw method now uses overlap for Intel on all platforms. 2010-07-16 10:13:04 +00:00
Brecht Van Lommel
267c286091 Fix compile error after merge, gpu_buffers.h -> GPU_buffers.h. 2010-07-14 14:31:27 +00:00
Jason Wilkins
5505697ac5 Merge GSOC Sculpt Branch: 28499-30319
https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins
See log of that branch for details.
2010-07-14 14:11:03 +00:00
Brecht Van Lommel
f406cf4ac8 Fix a few compile warnings and rename gpu_buffers.h to GPU_buffers.h
for consistency.
2010-07-14 10:46:12 +00:00
Campbell Barton
3580d6229a - text3d was missing menu items for toggling bold/underline/italic/smallcaps.
- made smallcaps use a temp flag so caps can still have the smallcaps flag.
- utility function for getting the char from a font. find_vfont_char(), was inline in ~5 places.
- removed CU_STYLE mix of flags only used in one place, not needed. removed 'style' from rna too.
- fix for some warnings.
2010-07-13 23:51:21 +00:00
Brecht Van Lommel
ee03a99695 Fix #20461: deleting VBO's from threads used for rendering or baking would
crash, as OpenGL can't be called from these. Now deleting VBO's is delayed
until the next redraw in the main thread.
2010-07-13 13:31:43 +00:00
Brecht Van Lommel
90162cb0cb Fix #21894: backface selection wasn't working correct with < 24 bits colors,
e.g. thousands of colors on OS X, due to use of uninitialized value. Problem
tracked down and patch provided by Shane Ambler, thanks!
2010-07-04 12:24:19 +00:00
Nicholas Bishop
bd4d743db9 * Made sculpt drawing respect the "use VBO" preference.
* Hopefully this fixes some sculpt problems for people with broken drivers
2010-06-30 19:35:08 +00:00
Campbell Barton
0ac1564f68 opengl render was freeing all images from the graphics card each update.
with some 4x4k and 4x8k textures this becomes very slow.

only free animated textures (movies and sequences)
2010-05-20 16:08:06 +00:00
Campbell Barton
389e590460 ghash alloc string from render branch
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r28571:28573
 svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r28575:28576
2010-05-07 07:54:25 +00:00
Brecht Van Lommel
0c495ffe10 Fix for GPU_free_unused_buffers deadlock, solution by Tamito Kajiyama, thanks! 2010-05-05 17:14:43 +00:00
Brecht Van Lommel
3f12beb4d0 Fix #22123 and #22124: some problems with mutex locks, also tweak to
how removing opengl textures from outside main thread is done so it
happens as part of the main loop.
2010-04-25 10:49:13 +00:00
Campbell Barton
ace1c998c4 warning cleanup, also made voxel.c and volumetric.c use BM_INLINE define rather then having their own ifdefs in each file. 2010-04-24 10:08:07 +00:00
Dalai Felinto
6562e6a4d1 PThreads "fix" for CMake / MSVC
I heard that the actual solution would be to remove #include <pthread.h> from BLI_threads.h
But in the mean time is not fair to CMake/MSVC to be the only system not building ;)
2010-04-16 23:58:12 +00:00
Brecht Van Lommel
9a85013692 Merge various small changes from render branch:
* Division by zero fix for TNT SVD code.
* Sound fix, in case ffmpeg decode fails, don't use the samples.
* Fix for incorrect bounds of transformed objects in new raytracing code.
* Gave memory arena's a name used for allocations for easier memory
  usage debugging.
* Dupligroup no_draw option was using layers but not restrict view/render
  setting. (not a bugfix exactly but would do display list context switching
  while drawing for no reason).
* Fix objects instanced on hair particles not giving consistent results
  when the object is transformed.
* New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4,
  mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4.
* mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple
  arguments.
* endjob callback for WM jobs system.
* Geometry node uv/color layer now has search list/autocomplete.
* Various small buildsystem tweaks, not strictly needed yet in trunk.
2010-04-15 10:28:32 +00:00
Guillermo S. Romero
7d9067ca2c Make memstat easier to read, add missing Intel ID and cleanups. 2010-04-14 21:12:05 +00:00
Thomas Dinges
22d4b02087 Fixing Scons compile on Windows:
*Missed PTHREAD declaration.
2010-04-14 17:15:33 +00:00
Joseph Eagar
0d557969b8 used private mutexes to avoid deadlocks 2010-04-13 20:34:40 +00:00
Joseph Eagar
86aa4e5c3d prevent images from freeing gpu buffers if not run within the main thread, instead they are queued to be freed the next time GPU_image_free() is run from the main thread. 2010-04-13 12:51:03 +00:00
Dalai Felinto
c1a9d4d7a3 Bugfix: 21586 - UI problems with Tiled Textures (animatable for GE)
The problem was present in Blender 2.49, but it didn't produce any side effect.
glScale was changing the texture matrix and the matrix was never been reset. That messes up with UI drawing.
2010-04-08 20:58:18 +00:00