Skip to content

Commit afe11cc

Browse files
committed
Merge branch 'master' of github.com:BradLarson/GPUImage3
2 parents 3c58363 + bc06f96 commit afe11cc

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ The objective of the framework is to make it as easy as possible to set up and p
2424

2525
The API is a clone of that used in <a href="https://github.com/BradLarson/GPUImage2">GPUImage 2</a>, and is intended to be a drop-in replacement for that version of the framework. Swapping between Metal and OpenGL versions of the framework should be as simple as changing which framework your application is linked against. A few low-level interfaces, such as those around texture input and output, will necessarily be Metal- or OpenGL-specific, but everything else is designed to be compatible between the two.
2626

27+
As of this point, we are not approving enhancement requests from outside contributors. We are actively working to port all of the functionality between this version of GPUImage adn previous versions. Once this task has been completed we will be happy to take community contributions.
28+
2729
## License ##
2830

2931
BSD-style, with the full license available with the framework in License.txt.

framework/Source/RenderView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class RenderView: MTKView, ImageConsumer {
99
var renderPipelineState:MTLRenderPipelineState!
1010

1111
public override init(frame frameRect: CGRect, device: MTLDevice?) {
12-
super.init(frame: frameRect, device: device)
12+
super.init(frame: frameRect, device: sharedMetalRenderingDevice.device)
1313

1414
commonInit()
1515
}

0 commit comments

Comments
 (0)