Changeset 22010 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 5, 2009 7:17:53 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix mesa entries patching for 64bit guests

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• fakedri_drv.c (modified) (3 diffs)
• pack/packspu_getstring.c (modified) (2 diffs)
• windows_getprocaddress.py (modified) (3 diffs)

trunk/src/VBox/Additions/common/crOpenGL/fakedri_drv.c

@@ -80 +80 @@
 #ifndef PAGESIZE
 #define PAGESIZE 4096
+#endif
+
+#ifdef RT_ARCH_AMD64
+# define DRI_ELFSYM Elf64_Sym
+#else
+# define DRI_ELFSYM Elf32_Sym
 #endif
 
@@ -130 +136 @@
 {
     Dl_info dlip;
-    Elf32_Sym* sym=0;
+    DRI_ELFSYM* sym=0;
     int rv;
     void *alPatch;
@@ -157 +163 @@
     {
         Dl_info dlip1;
-        Elf32_Sym* sym1=0;
+        DRI_ELFSYM* sym1=0;
         int rv;
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c

@@ -76 +76 @@
     ext = crStateMergeExtensions(1, &extensions);
 
+#if 1
+    {
+        const char *addext = "GL_EXT_compiled_vertex_array GL_S3_s3tc ";
+/*"GL_AMDX_vertex_shader_tessellator GL_AMD_draw_buffers_blend GL_AMD_performance_monitor "
+"GL_AMD_texture_texture4 GL_ARB_color_buffer_float GL_ARB_copy_buffer GL_ARB_depth_buffer_float "
+"GL_ARB_depth_texture GL_ARB_draw_buffers GL_ARB_draw_instanced GL_ARB_fragment_program "
+"GL_ARB_fragment_program_shadow GL_ARB_fragment_shader GL_ARB_framebuffer_object "
+"GL_ARB_framebuffer_sRGB GL_ARB_half_float_pixel GL_ARB_half_float_vertex GL_ARB_instanced_arrays "
+"GL_ARB_map_buffer_range GL_ARB_multisample GL_ARB_multitexture GL_ARB_occlusion_query "
+"GL_ARB_pixel_buffer_object GL_ARB_point_parameters GL_ARB_point_sprite GL_ARB_shader_objects "
+"GL_ARB_shader_texture_lod GL_ARB_shading_language_100 GL_ARB_shadow GL_ARB_shadow_ambient "
+"GL_ARB_texture_border_clamp GL_ARB_texture_buffer_object GL_ARB_texture_compression "
+"GL_ARB_texture_compression_rgtc GL_ARB_texture_cube_map GL_ARB_texture_env_add "
+"GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 "
+"GL_ARB_texture_float GL_ARB_texture_mirrored_repeat GL_ARB_texture_non_power_of_two "
+"GL_ARB_texture_rectangle GL_ARB_texture_rg GL_ARB_texture_snorm GL_ARB_transpose_matrix "
+"GL_ARB_vertex_array_object GL_ARB_vertex_buffer_object GL_ARB_vertex_program GL_ARB_vertex_shader "
+"GL_ARB_window_pos GL_ATI_draw_buffers GL_ATI_envmap_bumpmap GL_ATI_fragment_shader GL_ATI_meminfo "
+"GL_ATI_separate_stencil GL_ATI_texture_compression_3dc GL_ATI_texture_env_combine3 "
+"GL_ATI_texture_float GL_ATI_texture_mirror_once GL_EXT_abgr GL_EXT_bgra GL_EXT_bindable_uniform "
+"GL_EXT_blend_color GL_EXT_blend_equation_separate GL_EXT_blend_func_separate GL_EXT_blend_minmax "
+"GL_EXT_blend_subtract GL_EXT_compiled_vertex_array GL_EXT_copy_buffer GL_EXT_copy_texture "
+"GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_draw_range_elements GL_EXT_fog_coord "
+"GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_framebuffer_object "
+"GL_EXT_framebuffer_sRGB GL_EXT_gpu_program_parameters GL_EXT_gpu_shader4 GL_EXT_multi_draw_arrays "
+"GL_EXT_packed_depth_stencil GL_EXT_packed_float GL_EXT_packed_pixels GL_EXT_point_parameters "
+"GL_EXT_rescale_normal GL_EXT_secondary_color GL_EXT_separate_specular_color "
+"GL_EXT_shadow_funcs GL_EXT_stencil_wrap GL_EXT_subtexture GL_EXT_texgen_reflection "
+"GL_EXT_texture3D GL_EXT_texture_array GL_EXT_texture_buffer_object "
+"GL_EXT_texture_compression_latc GL_EXT_texture_compression_rgtc GL_EXT_texture_compression_s3tc "
+"GL_EXT_texture_cube_map GL_EXT_texture_edge_clamp GL_EXT_texture_env_add "
+"GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_EXT_texture_filter_anisotropic "
+"GL_EXT_texture_integer GL_EXT_texture_lod GL_EXT_texture_lod_bias GL_EXT_texture_mirror_clamp "
+"GL_EXT_texture_object GL_EXT_texture_rectangle GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent "
+"GL_EXT_texture_snorm GL_EXT_texture_swizzle GL_EXT_transform_feedback GL_EXT_vertex_array "
+"GL_IBM_texture_mirrored_repeat GL_KTX_buffer_region GL_NV_blend_square GL_NV_conditional_render "
+"GL_NV_copy_depth_to_color GL_NV_primitive_restart GL_NV_texgen_reflection GL_SGIS_generate_mipmap "
+"GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_SUN_multi_draw_arrays GL_WIN_swap_hint "
+"WGL_EXT_swap_control";*/
+
+        sprintf(gpszExtensions, "%s%s", addext, ext);
+    }
+#else
     sprintf(gpszExtensions, "%s", ext);
+#endif
 
     return gpszExtensions;
@@ -84 +128 @@
 static bool packspuRunningUnderWine(void)
 {
-    return NULL != GetModuleHandle("wined3d.dll");
+    return 1;//NULL != GetModuleHandle("wined3d.dll");
 }
 #endif

trunk/src/VBox/Additions/common/crOpenGL/windows_getprocaddress.py

@@ -97 +97 @@
 extern BOOL WINAPI wglGetPixelFormatAttribivEXT_prox(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *pValues);
 extern BOOL WINAPI wglGetPixelFormatAttribfvEXT_prox(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, float *pValues);
+extern BOOL WINAPI wglSwapIntervalEXT_prox(int interval);
+extern int  WINAPI wglGetSwapIntervalEXT_prox(void);
+
+void WINAPI LockArraysEXT (GLint first, GLsizei count)
+{
+}
+
+void WINAPI UnlockArraysEXT (void)
+{
+}
 
 CR_PROC CR_APIENTRY crGetProcAddress( const char *name )
@@ -106 +116 @@
     wglGetPixelFormatAttribivEXTFunc_t wglGetPixelFormatAttribivEXT = wglGetPixelFormatAttribivEXT_prox;
     wglGetPixelFormatAttribfvEXTFunc_t wglGetPixelFormatAttribfvEXT = wglGetPixelFormatAttribfvEXT_prox;
+    wglSwapIntervalEXTFunc_t wglSwapIntervalEXT = wglSwapIntervalEXT_prox;
+    wglGetSwapIntervalEXTFunc_t wglGetSwapIntervalEXT = wglGetSwapIntervalEXT_prox;
+
 
     stubInit();
@@ -126 +139 @@
     if (!crStrcmp( name, "wglGetPixelFormatAttribivARB" )) return (CR_PROC) wglGetPixelFormatAttribivEXT;
     if (!crStrcmp( name, "wglGetPixelFormatAttribfvARB" )) return (CR_PROC) wglGetPixelFormatAttribfvEXT;
+
+    if (!crStrcmp( name, "wglSwapIntervalEXT" )) return (CR_PROC) wglSwapIntervalEXT;
+    if (!crStrcmp( name, "wglGetSwapIntervalEXT" )) return (CR_PROC) wglGetSwapIntervalEXT;
+
+    if (!crStrcmp( name, "glLockArraysEXT" )) return (CR_PROC) LockArraysEXT;
+    if (!crStrcmp( name, "glUnlockArraysEXT" )) return (CR_PROC) UnlockArraysEXT;
 
     crDebug("Returning GetProcAddress:NULL for %s", name);