diff --git a/misc/msvc10/quake3.vcxproj b/misc/msvc10/quake3.vcxproj
index 5966503d..b1790cf9 100644
--- a/misc/msvc10/quake3.vcxproj
+++ b/misc/msvc10/quake3.vcxproj
@@ -976,6 +976,41 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\..\code\renderercommon\tr_font.c" />
+    <ClCompile Include="..\..\code\renderercommon\tr_image_bmp.c" />
+    <ClCompile Include="..\..\code\renderercommon\tr_image_jpg.c" />
+    <ClCompile Include="..\..\code\renderercommon\tr_image_pcx.c" />
+    <ClCompile Include="..\..\code\renderercommon\tr_image_png.c" />
+    <ClCompile Include="..\..\code\renderercommon\tr_image_tga.c" />
+    <ClCompile Include="..\..\code\renderercommon\tr_noise.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_animation.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_backend.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_bsp.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_cmds.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_curve.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_flares.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_image.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_init.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_light.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_main.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_marks.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_mesh.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_model.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_model_iqm.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_scene.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_shade.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_shader.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_shade_calc.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_shadows.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_sky.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_subs.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_surface.c" />
+    <ClCompile Include="..\..\code\renderergl1\tr_world.c" />
     <ClCompile Include="..\..\code\sys\con_log.c" />
     <ClCompile Include="..\..\code\sys\con_passive.c" />
     <ClCompile Include="..\..\code\qcommon\cvar.c">
@@ -1695,35 +1730,6 @@
     <ClCompile Include="..\..\code\botlib\l_precomp.c" />
     <ClCompile Include="..\..\code\botlib\l_script.c" />
     <ClCompile Include="..\..\code\botlib\l_struct.c" />
-    <ClCompile Include="..\..\code\renderer\tr_animation.c" />
-    <ClCompile Include="..\..\code\renderer\tr_backend.c" />
-    <ClCompile Include="..\..\code\renderer\tr_bsp.c" />
-    <ClCompile Include="..\..\code\renderer\tr_cmds.c" />
-    <ClCompile Include="..\..\code\renderer\tr_curve.c" />
-    <ClCompile Include="..\..\code\renderer\tr_flares.c" />
-    <ClCompile Include="..\..\code\renderer\tr_font.c" />
-    <ClCompile Include="..\..\code\renderer\tr_image.c" />
-    <ClCompile Include="..\..\code\renderer\tr_image_bmp.c" />
-    <ClCompile Include="..\..\code\renderer\tr_image_jpg.c" />
-    <ClCompile Include="..\..\code\renderer\tr_image_pcx.c" />
-    <ClCompile Include="..\..\code\renderer\tr_image_png.c" />
-    <ClCompile Include="..\..\code\renderer\tr_image_tga.c" />
-    <ClCompile Include="..\..\code\renderer\tr_init.c" />
-    <ClCompile Include="..\..\code\renderer\tr_light.c" />
-    <ClCompile Include="..\..\code\renderer\tr_main.c" />
-    <ClCompile Include="..\..\code\renderer\tr_marks.c" />
-    <ClCompile Include="..\..\code\renderer\tr_mesh.c" />
-    <ClCompile Include="..\..\code\renderer\tr_model.c" />
-    <ClCompile Include="..\..\code\renderer\tr_model_iqm.c" />
-    <ClCompile Include="..\..\code\renderer\tr_noise.c" />
-    <ClCompile Include="..\..\code\renderer\tr_scene.c" />
-    <ClCompile Include="..\..\code\renderer\tr_shade.c" />
-    <ClCompile Include="..\..\code\renderer\tr_shade_calc.c" />
-    <ClCompile Include="..\..\code\renderer\tr_shader.c" />
-    <ClCompile Include="..\..\code\renderer\tr_shadows.c" />
-    <ClCompile Include="..\..\code\renderer\tr_sky.c" />
-    <ClCompile Include="..\..\code\renderer\tr_surface.c" />
-    <ClCompile Include="..\..\code\renderer\tr_world.c" />
     <ClCompile Include="..\..\code\libspeex\bits.c" />
     <ClCompile Include="..\..\code\libspeex\buffer.c" />
     <ClCompile Include="..\..\code\libspeex\cb_search.c" />
@@ -1781,6 +1787,12 @@
     <ClInclude Include="..\..\code\qcommon\cm_polylib.h" />
     <ClInclude Include="..\..\code\qcommon\cm_public.h" />
     <ClInclude Include="..\..\code\game\g_public.h" />
+    <ClInclude Include="..\..\code\renderercommon\iqm.h" />
+    <ClInclude Include="..\..\code\renderercommon\qgl.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_common.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_public.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_types.h" />
+    <ClInclude Include="..\..\code\renderergl1\tr_local.h" />
     <ClInclude Include="..\..\code\ui\keycodes.h" />
     <ClInclude Include="..\..\code\client\keys.h" />
     <ClInclude Include="..\..\code\qcommon\puff.h" />
diff --git a/misc/msvc10/quake3.vcxproj.filters b/misc/msvc10/quake3.vcxproj.filters
index 4a471966..e1789455 100644
--- a/misc/msvc10/quake3.vcxproj.filters
+++ b/misc/msvc10/quake3.vcxproj.filters
@@ -31,18 +31,18 @@
     <Filter Include="botlib\Header Files">
       <UniqueIdentifier>{e35bc6f6-1102-4c5c-a650-b7139842f45e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="renderer">
-      <UniqueIdentifier>{c82e323c-9a35-41ea-9f28-ee0c1e15c7ba}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="renderer\Source Files">
-      <UniqueIdentifier>{0ee0a9cb-f315-480b-b7c7-9b1f0d15db54}</UniqueIdentifier>
-    </Filter>
     <Filter Include="speex">
       <UniqueIdentifier>{78e83da0-aef9-489d-a068-e484f9f114da}</UniqueIdentifier>
     </Filter>
     <Filter Include="zlib">
       <UniqueIdentifier>{89531515-ab90-4808-b464-28319ea749c5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="renderercommon">
+      <UniqueIdentifier>{6df83ba6-3829-4dba-be13-b88e502e2643}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="renderergl1">
+      <UniqueIdentifier>{a0272781-b682-44ec-919d-b349861756d3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\code\client\cl_avi.c">
@@ -456,93 +456,6 @@
     <ClCompile Include="..\..\code\botlib\l_struct.c">
       <Filter>botlib\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_animation.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_backend.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_bsp.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_cmds.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_curve.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_flares.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_font.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_image.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_image_bmp.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_image_jpg.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_image_pcx.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_image_png.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_image_tga.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_init.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_light.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_main.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_marks.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_mesh.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_model.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_model_iqm.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_noise.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_scene.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_shade.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_shade_calc.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_shader.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_shadows.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_sky.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_surface.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\code\renderer\tr_world.c">
-      <Filter>renderer\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\code\libspeex\bits.c">
       <Filter>speex</Filter>
     </ClCompile>
@@ -681,6 +594,96 @@
     <ClCompile Include="..\..\code\zlib\zutil.c">
       <Filter>zlib</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\code\renderercommon\tr_font.c">
+      <Filter>renderercommon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderercommon\tr_image_bmp.c">
+      <Filter>renderercommon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderercommon\tr_image_jpg.c">
+      <Filter>renderercommon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderercommon\tr_image_pcx.c">
+      <Filter>renderercommon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderercommon\tr_image_png.c">
+      <Filter>renderercommon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderercommon\tr_image_tga.c">
+      <Filter>renderercommon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderercommon\tr_noise.c">
+      <Filter>renderercommon</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_animation.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_backend.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_bsp.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_cmds.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_curve.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_flares.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_image.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_init.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_light.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_main.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_marks.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_mesh.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_model.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_model_iqm.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_scene.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_shade.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_shade_calc.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_shader.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_shadows.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_sky.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_subs.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_surface.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\code\renderergl1\tr_world.c">
+      <Filter>renderergl1</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\code\game\bg_public.h">
@@ -884,6 +887,24 @@
     <ClInclude Include="..\..\code\libspeex\config.h">
       <Filter>speex</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\renderercommon\iqm.h">
+      <Filter>renderercommon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\renderercommon\qgl.h">
+      <Filter>renderercommon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\renderercommon\tr_common.h">
+      <Filter>renderercommon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\renderercommon\tr_public.h">
+      <Filter>renderercommon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\renderercommon\tr_types.h">
+      <Filter>renderercommon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\renderergl1\tr_local.h">
+      <Filter>renderergl1</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\code\sys\win_resource.rc">