Skip to content

Commit

Permalink
Merge pull request BradLarson#1910 from joelteply/patch-3
Browse files Browse the repository at this point in the history
Allow for luminance upload
  • Loading branch information
BradLarson committed Apr 3, 2016
2 parents d63c232 + f20e476 commit 9b02aa8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion framework/Source/GPUImageRawDataInput.m
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ - (void)uploadBytes:(GLubyte *)bytesToUpload;
outputFramebuffer = [[GPUImageContext sharedFramebufferCache] fetchFramebufferForSize:uploadedImageSize textureOptions:self.outputTextureOptions onlyTexture:YES];

glBindTexture(GL_TEXTURE_2D, [outputFramebuffer texture]);
glTexImage2D(GL_TEXTURE_2D, 0, _pixelFormat==GPUPixelFormatRGB ? GL_RGB : GL_RGBA, (int)uploadedImageSize.width, (int)uploadedImageSize.height, 0, (GLint)_pixelFormat, (GLenum)_pixelType, bytesToUpload);
glTexImage2D(GL_TEXTURE_2D, 0, _pixelFormat, (int)uploadedImageSize.width, (int)uploadedImageSize.height, 0, (GLint)_pixelFormat, (GLenum)_pixelType, bytesToUpload);
}

- (void)updateDataFromBytes:(GLubyte *)bytesToUpload size:(CGSize)imageSize;
Expand Down

0 comments on commit 9b02aa8

Please sign in to comment.