]> git.sesse.net Git - movit/commitdiff
Yet another use-NULL-instead-of-giving-in-empty-stuff cleanup.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 3 Oct 2012 18:25:54 +0000 (20:25 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 3 Oct 2012 18:25:54 +0000 (20:25 +0200)
effect_chain.cpp

index c55ee26849617374010b879785b6fcfd5cd55b52..7cc23ff1c1cbd98114f9d076ed20a52f00d4ee6a 100644 (file)
@@ -263,10 +263,7 @@ void EffectChain::finalize()
        check_error();
        glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, width * height * bytes_per_pixel, NULL, GL_STREAM_DRAW);
        check_error();
-
-       void *mapped_pbo = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY);
-       memset(mapped_pbo, 0, width * height * bytes_per_pixel);
-       glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
+       glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
        check_error();
        
        glGenTextures(1, &source_image_num);
@@ -275,9 +272,7 @@ void EffectChain::finalize()
        check_error();
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        check_error();
-       glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
-       check_error();
-       glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+       glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
        check_error();
 
        finalized = true;