mesa: add support for memory object creation/import/delete

[mesa.git] / src / mesa / main / cpuinfo.c

diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c
index 35de69b180fdbae6a2bf425ec80b2d9ca6a041d7..67f22ab9c81759fe509c46bc9127d59600792709 100644 (file)
--- a/src/mesa/main/cpuinfo.c
+++ b/src/mesa/main/cpuinfo.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.5
  *
  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
@@ -17,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -34,7 +34,7 @@
 void
 _mesa_get_cpu_features(void)
 {
-#ifdef USE_X86_ASM
+#if defined USE_X86_ASM || defined USE_X86_64_ASM
    _mesa_get_x86_features();
 #endif
 }
@@ -51,7 +51,7 @@ _mesa_get_cpu_string(void)
 #define MAX_STRING 50
    char *buffer;
 
-   buffer = (char *) malloc(MAX_STRING);
+   buffer = malloc(MAX_STRING);
    if (!buffer)
       return NULL;
 
@@ -83,24 +83,6 @@ _mesa_get_cpu_string(void)
 
    strcat(buffer, "SPARC");
 
-#elif defined(USE_PPC_ASM)
-
-   if (_mesa_ppc_cpu_features) {
-      strcat(buffer, (cpu_has_64) ? "PowerPC 64" : "PowerPC");
-   }
-
-# ifdef USE_VMX_ASM
-
-   if (cpu_has_vmx) {
-      strcat(buffer, "/Altivec");
-   }
-
-# endif
-
-   if (! cpu_has_fpu) {
-      strcat(buffer, "/No FPU");
-   }
-
 #endif
 
    assert(strlen(buffer) < MAX_STRING);