From ef45bdaf3e65af727fd67d9ff9af59cb7d0d46c0 Mon Sep 17 00:00:00 2001
From: Ken Russell <kbrussel@alum.mit.edu>
Date: Fri, 3 Dec 2021 18:25:10 -0800
Subject: [PATCH] Set gl_PointSize in primitive restart tests for GL_POINTS.

Failing to set this was relying on currently-undefined behavior and
causing the tests to fail on Apple's M1.

Related to #2818, #2822 and #3356.
---
 .../functional/gles3/es3fPrimitiveRestartTests.js     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sdk/tests/deqp/functional/gles3/es3fPrimitiveRestartTests.js b/sdk/tests/deqp/functional/gles3/es3fPrimitiveRestartTests.js
index 85973665ad..ac0da2fe66 100644
--- a/sdk/tests/deqp/functional/gles3/es3fPrimitiveRestartTests.js
+++ b/sdk/tests/deqp/functional/gles3/es3fPrimitiveRestartTests.js
@@ -334,10 +334,15 @@ var gluTextureUtil = framework.opengl.gluTextureUtil;
             '\n' +
             'void main()\n' +
             ' {\n' +
-            ' gl_Position = a_position;\n' +
-            '}\n';
+            ' gl_Position = a_position;\n';
+
+        if (this.m_primType == es3fPrimitiveRestartTests.PrimitiveType.PRIMITIVE_POINTS) {
+            vertShaderSource += ' gl_PointSize = 1.0;\n';
+        }
+
+        vertShaderSource += '}\n';
 
-            /** @type {string} */ var fragShaderSource =
+        /** @type {string} */ var fragShaderSource =
             '#version 300 es\n' +
             'layout(location = 0) out mediump vec4 o_color;\n' +
             '\n' +