Mercurial > hg > truffle

comparison src/os/linux/vm/gpu_linux.cpp @ 15182:89325b6051ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Matthias Grimmer <grimmer@ssw.jku.at>
date Thu, 17 Apr 2014 08:22:21 +0200
parents 66e3af78ea96
children
comparison
equal deleted inserted replaced
15181:5be5e917e421 15182:89325b6051ea
36 static unsigned int nvidia_vendor_id = 0x10de; 36 static unsigned int nvidia_vendor_id = 0x10de;
37 static unsigned int amd_vendor_id = 0x1002; 37 static unsigned int amd_vendor_id = 0x1002;
38 38
39 #define PCI_DRIVER_NAME_START_POS 255 39 #define PCI_DRIVER_NAME_START_POS 255
40 40
41 jobject gpu::probe_gpus(JNIEnv* env) { 41 jobject Gpu::probe_gpus(JNIEnv* env) {
42 bool hsail = false; 42 bool hsail = false;
43 bool ptx = false; 43 bool ptx = false;
44 44
45 if (Hsail::register_natives(env)) { 45 if (Hsail::register_natives(env)) {
46 hsail = true; 46 hsail = true;