Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-09-14 06:13:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-09-14 06:13:48 +0300
commit754fb6b9074a7785da8af2d6615c0e92900fb5fa (patch)
tree80696755d808c592e57d4a97a9d9a63d0e718e83 /source/blender/gpu/intern
parentd64b1221c67846bb954855a19c8dd093b83adc8e (diff)
Revert "Fix crash in opengl render caused..."
This reverts commit d64b1221c67846bb954855a19c8dd093b83adc8e. While this prevents the crash, offscreen renders still aren't working right.
Diffstat (limited to 'source/blender/gpu/intern')
-rw-r--r--source/blender/gpu/intern/gpu_extensions.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index e69c74bbef8..a6a34296ca2 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -1473,12 +1473,6 @@ void GPU_offscreen_read_pixels(GPUOffScreen *ofs, int type, void *pixels)
glReadPixels(0, 0, ofs->color->w, ofs->color->h, GL_RGBA, type, pixels);
}
-//if non power of two textures are not supported, than ofs->w/h may not be same size as allocated *pixels
-void GPU_offscreen_read_pixels_wh(GPUOffScreen *ofs, int width, int height, int type, void *pixels)
-{
- glReadPixels(0, 0, width, height, GL_RGBA, type, pixels);
-}
-
int GPU_offscreen_width(const GPUOffScreen *ofs)
{
return ofs->color->w;