[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

diff --git a/reactos/dll/opengl/mesa/CMakeLists.txt b/reactos/dll/opengl/mesa/CMakeLists.txt
index d83272d..67c461b 100644 (file)
--- 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 613c2b2..f6feeac 100644 (file)
--- 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 ) ==