From 7306a8ad57c2d2fd5f51a847414cf3d4d6fa392d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= <jerome.gardou@reactos.org>
Date: Fri, 24 Aug 2012 16:28:09 +0000
Subject: [PATCH] [OPENGL] - Add some optimizations (GCC) on compilation of
 libMesa - Move opengl32 to the opengl directory - Disable ICD refcounting for
 now, it does more harm than good.

svn path=/trunk/; revision=57153
---
 reactos/dll/opengl/mesa/CMakeLists.txt                | 2 ++
 reactos/dll/{win32 => opengl}/opengl32/CMakeLists.txt | 0
 reactos/dll/{win32 => opengl}/opengl32/font.c         | 0
 reactos/dll/{win32 => opengl}/opengl32/gl.c           | 0
 reactos/dll/{win32 => opengl}/opengl32/glfuncs.h      | 0
 reactos/dll/{win32 => opengl}/opengl32/icdlist.h      | 0
 reactos/dll/{win32 => opengl}/opengl32/icdtable.h     | 0
 reactos/dll/{win32 => opengl}/opengl32/opengl32.c     | 0
 reactos/dll/{win32 => opengl}/opengl32/opengl32.dsp   | 0
 reactos/dll/{win32 => opengl}/opengl32/opengl32.dsw   | 0
 reactos/dll/{win32 => opengl}/opengl32/opengl32.h     | 0
 reactos/dll/{win32 => opengl}/opengl32/opengl32.spec  | 0
 reactos/dll/{win32 => opengl}/opengl32/wgl.c          | 2 ++
 13 files changed, 4 insertions(+)
 rename reactos/dll/{win32 => opengl}/opengl32/CMakeLists.txt (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/font.c (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/gl.c (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/glfuncs.h (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/icdlist.h (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/icdtable.h (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/opengl32.c (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/opengl32.dsp (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/opengl32.dsw (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/opengl32.h (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/opengl32.spec (100%)
 rename reactos/dll/{win32 => opengl}/opengl32/wgl.c (99%)

diff --git a/reactos/dll/opengl/mesa/CMakeLists.txt b/reactos/dll/opengl/mesa/CMakeLists.txt
index d83272de8b5..67c461bd9b4 100644
--- a/reactos/dll/opengl/mesa/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/CMakeLists.txt
@@ -14,6 +14,8 @@ include_directories(
 if(NOT MSVC)
     add_compile_flags_language("-std=gnu99" "C")
     add_compile_flags("-Wno-deprecated-declarations")
+    # optimizations (builtin memcmp is slow on some gcc versions) used in SConsript files
+    add_compile_flags("-ffast-math -fno-builtin-memcmp")
 else()
     include_directories(include/c99)
     add_compile_flags("/wd4996")
diff --git a/reactos/dll/win32/opengl32/CMakeLists.txt b/reactos/dll/opengl/opengl32/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/opengl32/CMakeLists.txt
rename to reactos/dll/opengl/opengl32/CMakeLists.txt
diff --git a/reactos/dll/win32/opengl32/font.c b/reactos/dll/opengl/opengl32/font.c
similarity index 100%
rename from reactos/dll/win32/opengl32/font.c
rename to reactos/dll/opengl/opengl32/font.c
diff --git a/reactos/dll/win32/opengl32/gl.c b/reactos/dll/opengl/opengl32/gl.c
similarity index 100%
rename from reactos/dll/win32/opengl32/gl.c
rename to reactos/dll/opengl/opengl32/gl.c
diff --git a/reactos/dll/win32/opengl32/glfuncs.h b/reactos/dll/opengl/opengl32/glfuncs.h
similarity index 100%
rename from reactos/dll/win32/opengl32/glfuncs.h
rename to reactos/dll/opengl/opengl32/glfuncs.h
diff --git a/reactos/dll/win32/opengl32/icdlist.h b/reactos/dll/opengl/opengl32/icdlist.h
similarity index 100%
rename from reactos/dll/win32/opengl32/icdlist.h
rename to reactos/dll/opengl/opengl32/icdlist.h
diff --git a/reactos/dll/win32/opengl32/icdtable.h b/reactos/dll/opengl/opengl32/icdtable.h
similarity index 100%
rename from reactos/dll/win32/opengl32/icdtable.h
rename to reactos/dll/opengl/opengl32/icdtable.h
diff --git a/reactos/dll/win32/opengl32/opengl32.c b/reactos/dll/opengl/opengl32/opengl32.c
similarity index 100%
rename from reactos/dll/win32/opengl32/opengl32.c
rename to reactos/dll/opengl/opengl32/opengl32.c
diff --git a/reactos/dll/win32/opengl32/opengl32.dsp b/reactos/dll/opengl/opengl32/opengl32.dsp
similarity index 100%
rename from reactos/dll/win32/opengl32/opengl32.dsp
rename to reactos/dll/opengl/opengl32/opengl32.dsp
diff --git a/reactos/dll/win32/opengl32/opengl32.dsw b/reactos/dll/opengl/opengl32/opengl32.dsw
similarity index 100%
rename from reactos/dll/win32/opengl32/opengl32.dsw
rename to reactos/dll/opengl/opengl32/opengl32.dsw
diff --git a/reactos/dll/win32/opengl32/opengl32.h b/reactos/dll/opengl/opengl32/opengl32.h
similarity index 100%
rename from reactos/dll/win32/opengl32/opengl32.h
rename to reactos/dll/opengl/opengl32/opengl32.h
diff --git a/reactos/dll/win32/opengl32/opengl32.spec b/reactos/dll/opengl/opengl32/opengl32.spec
similarity index 100%
rename from reactos/dll/win32/opengl32/opengl32.spec
rename to reactos/dll/opengl/opengl32/opengl32.spec
diff --git a/reactos/dll/win32/opengl32/wgl.c b/reactos/dll/opengl/opengl32/wgl.c
similarity index 99%
rename from reactos/dll/win32/opengl32/wgl.c
rename to reactos/dll/opengl/opengl32/wgl.c
index 613c2b216f9..f6feeac8a0e 100644
--- a/reactos/dll/win32/opengl32/wgl.c
+++ b/reactos/dll/opengl/opengl32/wgl.c
@@ -129,6 +129,8 @@ VOID
 ROSGL_DeleteDCDataForICD( GLDRIVERDATA *icd )
 {
     GLDCDATA *p, **pptr;
+    
+    return;
 
     /* synchronize */
     if (WaitForSingleObject( OPENGL32_processdata.dcdata_mutex, INFINITE ) ==