Fix build errors related with variable defined array length and gl te…

…sts logged error
KhronosGroup · Apr 29, 2024 · 6832508 · 6832508
1 parent adab23d
commit 6832508
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/test_common/gl/setup_x11.cpp b/test_common/gl/setup_x11.cpp
@@ -39,10 +39,10 @@ class X11GLEnvironment : public GLEnvironment
          // Create a GLUT window to render into
          if (!m_glut_init)
          {
-             glutInit( argc, argv );
-             glutInitWindowSize( 512, 512 );
-             glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-             glutCreateWindow( "OpenCL <-> OpenGL Test" );
+             glutInit(argc, argv);
+             glutInitWindowSize(512, 512);
+             glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
+             glutCreateWindow("OpenCL <-> OpenGL Test");
              glewInit();
              m_glut_init = true;
          }

diff --git a/test_conformance/api/test_native_kernel.cpp b/test_conformance/api/test_native_kernel.cpp
@@ -46,7 +46,7 @@ int test_native_kernel(cl_device_id device, cl_context context, cl_command_queue
     }
 
     clMemWrapper streams[ 2 ];
-#if !(defined (_WIN32) && defined (_MSC_VER))
+#if !(defined(_WIN32) && defined(_MSC_VER))
     cl_int *inBuffer = new cl_int[n_elems * sizeof(cl_int)];
     cl_int *outBuffer = new cl_int[n_elems * sizeof(cl_int)];
 #else
@@ -110,11 +110,7 @@ int test_native_kernel(cl_device_id device, cl_context context, cl_command_queue
             return 1;
         }
     }
-<<<<<<< HEAD
-#if !(defined (_WIN32) && defined (_MSC_VER))
-=======
 #if !(defined(_WIN32) && defined(_MSC_VER))
->>>>>>> 24d321a (Fix build errors related with variable defined array length and gl tests logged error)
     delete[] inBuffer;
     delete[] outBuffer;
 #endif