Merge pull request #6534 from deathbeam/switch-to-core-gpu

Switch to core profile in GPU plugin
This commit is contained in:
Adam
2018-11-18 12:30:42 -05:00
committed by GitHub
4 changed files with 5 additions and 5 deletions

View File

@@ -228,7 +228,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
GLProfile.initSingleton(); GLProfile.initSingleton();
GLProfile glProfile = GLProfile.get(GLProfile.GL4bc); GLProfile glProfile = GLProfile.get(GLProfile.GL4);
GLCapabilities glCaps = new GLCapabilities(glProfile); GLCapabilities glCaps = new GLCapabilities(glProfile);
AWTGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), glCaps, glCaps); AWTGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), glCaps, glCaps);
@@ -890,7 +890,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
// Texture on UI // Texture on UI
gl.glBindVertexArray(vaoUiHandle); gl.glBindVertexArray(vaoUiHandle);
gl.glDrawArrays(gl.GL_QUADS, 0, 4); gl.glDrawArrays(gl.GL_TRIANGLE_FAN, 0, 4);
// Reset // Reset
gl.glBindTexture(gl.GL_TEXTURE_2D, 0); gl.glBindTexture(gl.GL_TEXTURE_2D, 0);

View File

@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#version 400 #version 330
uniform sampler2DArray textures; uniform sampler2DArray textures;
uniform vec2 textureOffsets[64]; uniform vec2 textureOffsets[64];

View File

@@ -23,7 +23,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#version 400 #version 330
#define PI 3.1415926535897932384626433832795f #define PI 3.1415926535897932384626433832795f
#define UNIT PI / 1024.0f #define UNIT PI / 1024.0f

View File

@@ -23,7 +23,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#version 400 #version 330
layout (location = 0) in ivec4 VertexPosition; layout (location = 0) in ivec4 VertexPosition;
layout (location = 1) in vec4 uv; layout (location = 1) in vec4 uv;