Skip to content

Commit

Permalink
Fixed a bug on how AGPMInjector GPU selection was causing a crash whe…
Browse files Browse the repository at this point in the history 
…n selecting GTX 650
  • Loading branch information
@Pavo-IM
Pavo-IM committed Jan 13, 2021
1 parent e568361 commit 554f6a7
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 26 deletions.
4 changes: 2 additions & 2 deletions OC Gen-X.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 2.7.9;
MARKETING_VERSION = 2.8.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.oc-gen-x.OC-Gen-X";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -603,7 +603,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 2.7.9;
MARKETING_VERSION = 2.8.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.oc-gen-x.OC-Gen-X";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
Binary file modified ...proj/project.xcworkspace/xcuserdata/henrybrock.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
36 changes: 18 additions & 18 deletions OC Gen-X/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -714,11 +714,11 @@
<customObject id="ISc-R2-Unv" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
<viewController id="7uK-TB-ntZ" customClass="MainVC" customModule="OC_Gen_X" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="ZeK-sO-E8j">
<rect key="frame" x="0.0" y="0.0" width="797" height="537"/>
<rect key="frame" x="0.0" y="0.0" width="797" height="582"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Wcy-uw-NdK">
<rect key="frame" x="338" y="108" width="121" height="32"/>
<rect key="frame" x="338" y="108" width="121" height="33"/>
<buttonCell key="cell" type="push" title="Generate EFI" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jnc-4n-FlM">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -744,7 +744,7 @@
</textFieldCell>
</textField>
<tabView translatesAutoresizingMaskIntoConstraints="NO" id="UIh-RX-3Ag">
<rect key="frame" x="-7" y="165" width="811" height="378"/>
<rect key="frame" x="-7" y="166" width="811" height="422"/>
<font key="font" metaFont="system"/>
<tabViewItems>
<tabViewItem label="System Type" identifier="" id="pdY-nd-ywG">
Expand Down Expand Up @@ -987,11 +987,11 @@
</tabViewItem>
<tabViewItem label="Kext" identifier="" id="9mi-No-NeI">
<view key="view" id="LRE-jA-RHI">
<rect key="frame" x="10" y="33" width="791" height="383"/>
<rect key="frame" x="10" y="33" width="791" height="376"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tabView translatesAutoresizingMaskIntoConstraints="NO" id="iVY-nQ-w4Y">
<rect key="frame" x="-7" y="-7" width="809" height="396"/>
<rect key="frame" x="-7" y="-13" width="809" height="395"/>
<font key="font" metaFont="system"/>
<tabViewItems>
<tabViewItem label="Essential" identifier="" id="XhX-Gy-OsH">
Expand Down Expand Up @@ -1101,11 +1101,11 @@ Add watchdog=0 to disable WatchDog timer (if you get accidental reboots).</strin
</tabViewItem>
<tabViewItem label="Graphics" identifier="" id="CsQ-iK-bJm">
<view key="view" id="0Jc-f5-SUh">
<rect key="frame" x="10" y="33" width="789" height="350"/>
<rect key="frame" x="10" y="33" width="789" height="349"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button toolTip="Lilu plugin providing patches to select GPUs on macOS. Requires Lilu 1.4.0 or newer.

Boot Args:" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hIN-Qd-vMG">
<rect key="frame" x="8" y="313" width="121" height="18"/>
<rect key="frame" x="8" y="312" width="121" height="18"/>
<buttonCell key="cell" type="check" title="WhateverGreen" bezelStyle="regularSquare" imagePosition="left" inset="2" id="iDh-wY-X4B">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -1115,15 +1115,15 @@ Add watchdog=0 to disable WatchDog timer (if you get accidental reboots).</strin
</connections>
</button>
<textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NI0-4Z-WL9">
<rect key="frame" x="8" y="269" width="168" height="25"/>
<rect key="frame" x="8" y="268" width="168" height="25"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="WhateverGreen Boot-Args:" id="DhZ-jd-01r">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField hidden="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gOy-PJ-qmO">
<rect key="frame" x="184" y="269" width="585" height="25"/>
<rect key="frame" x="184" y="268" width="585" height="25"/>
<constraints>
<constraint firstAttribute="height" constant="25" id="Gfp-F4-rpj"/>
</constraints>
Expand All @@ -1134,11 +1134,11 @@ Add watchdog=0 to disable WatchDog timer (if you get accidental reboots).</strin
</textFieldCell>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="yJa-nM-hOu">
<rect key="frame" x="74" y="82" width="100" height="100"/>
<rect key="frame" x="74" y="81" width="100" height="100"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="macpro" id="fKH-JT-Ih4"/>
</imageView>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YcY-Lh-1Ee">
<rect key="frame" x="191" y="122" width="78" height="25"/>
<rect key="frame" x="191" y="121" width="78" height="25"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="g9P-ij-Ojp" id="jrx-Mu-18x">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
Expand All @@ -1155,10 +1155,10 @@ Add watchdog=0 to disable WatchDog timer (if you get accidental reboots).</strin
</connections>
</popUpButton>
<box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="RbS-Hl-ocT">
<rect key="frame" x="392" y="0.0" width="5" height="248"/>
<rect key="frame" x="392" y="0.0" width="5" height="247"/>
</box>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Ky-8V-ol0">
<rect key="frame" x="415" y="90" width="50" height="56"/>
<rect key="frame" x="415" y="90" width="50" height="55"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="amd-radeon" id="prT-mc-Ngf"/>
</imageView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="2pH-I6-VSF">
Expand Down Expand Up @@ -1200,23 +1200,23 @@ Add watchdog=0 to disable WatchDog timer (if you get accidental reboots).</strin
</popUpButtonCell>
</popUpButton>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SrQ-id-QaZ">
<rect key="frame" x="192" y="166" width="99" height="16"/>
<rect key="frame" x="192" y="165" width="99" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Select SMBIOS:" id="Njp-By-ZrO">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KZH-69-5OJ">
<rect key="frame" x="413" y="166" width="143" height="16"/>
<rect key="frame" x="413" y="165" width="143" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Select Dedicated GPU:" id="UX4-mU-bJK">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WJb-lD-UZf">
<rect key="frame" x="8" y="211" width="110" height="18"/>
<rect key="frame" x="8" y="210" width="110" height="18"/>
<buttonCell key="cell" type="check" title="AGPMInjector" bezelStyle="regularSquare" imagePosition="left" inset="2" id="Mbx-pR-O0W">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
Expand All @@ -1226,7 +1226,7 @@ Add watchdog=0 to disable WatchDog timer (if you get accidental reboots).</strin
</connections>
</button>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="PIP-zA-VJE">
<rect key="frame" x="0.0" y="246" width="785" height="5"/>
<rect key="frame" x="0.0" y="245" width="785" height="5"/>
</box>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="v9M-9n-Jdn">
<rect key="frame" x="695" y="31" width="78" height="25"/>
Expand Down Expand Up @@ -1789,7 +1789,7 @@ Add watchdog=0 to disable WatchDog timer (if you get accidental reboots).</strin
</tabViewItems>
</tabView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JJY-uW-evJ">
<rect key="frame" x="561" y="145" width="218" height="15"/>
<rect key="frame" x="561" y="145" width="218" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Supported OpenCore version: 0.6.5" id="c09-ms-Iid">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
Expand Down
2 changes: 1 addition & 1 deletion OC Gen-X/Config/AGPM.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ struct setGpu: Encodable {
case W9100 = "Vendor1002Device67a0"
case GT710 = "Vendor10deDevice128b"
case GT730 = "Vendor10deDevice1287"
case GTX650 = "Vendor10deDevice8428"
case GTX650 = "Vendor10deDevice0fc6"
case GTX650Ti = "Vendor10deDevice11c6"
case GTX650TIBoost = "Vendor10deDevice11c2"
case GTX760 = "Vendor10deDevice1187"
Expand Down
Loading

0 comments on commit 554f6a7

Please sign in to comment.