ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
48,052 Commits 2 Branches 0 Tags 54 MiB
1c09c92f2b
Commit Graph

731 Commits

Author SHA1 Message Date
Jesse Hall
519191670e am 873ab60e: am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention" 
# By luliuhui
# Via Android Git Automerger (1) and others
* commit '873ab60e94811488caea1906eb98133329a3e28f':
  Gfx-3d: fix GetProcAddress in egl extention
 2013-02-01 14:26:21 -08:00
Jesse Hall
873ab60e94 am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention" 
# By luliuhui
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7':
  Gfx-3d: fix GetProcAddress in egl extention
 2013-02-01 12:37:25 -08:00
luliuhui
69d100762c Gfx-3d: fix GetProcAddress in egl extention 
This patch can fix issue when Proc address return NULL.
Glbench10, egl-ext and conformance test need this patch to run pass.

Change-Id: I275c7cb6f77cb334c3ee7fa23cd696bba1c5a458
Author: Liuhui Lu <liuhui.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 52622
 2013-01-22 15:14:34 +08:00
Siva Velusamy
582dbf82f9 Merge "gltrace: Add support for tracing running applications." 2012-12-20 10:52:00 -08:00
Siva Velusamy
a73a97728b gltrace: Add support for tracing running applications. 
Currently, to activate OpenGL tracing, an application has to be
start with --opengl-trace option (or have a debug prop set).

This CL adds support for tracing an application which may already
be running. This is implemented as follows:
    - DDMS initiates a JDWP message to the VM indicating that
      opengl traces be enabled.
    - When that message is received, a flag is set that indicates
      that tracing should be enabled.
    - The trace flag is checked during every eglSwap() operation,
      and if it finds that tracing should be active and it isn't,
      then it starts the tracing component.

Change-Id: I3347fe89fc06c7404d7aa9360f4b21e5bf36ebcb
 2012-12-20 10:38:47 -08:00
Jesse Hall
52f733c457 Merge "Merge extensions as published at khronos.org" 2012-12-19 14:07:09 -08:00
Andy McFadden
2adaf04fab Rename ISurfaceTexture and SurfaceTexture 
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: Ia03e468888025b5cae3c0ee1995434515dbea387
 2012-12-18 13:10:48 -08:00
Jesse Hall
31134cd480 Merge extensions as published at khronos.org 
No significant changes. The extensions now have assigned extensions
numbers. And Jon Leech added missing suffixes in the declaration of
eglSetBlobCacheFuncsANDROID; our header and code already had the
suffix.

Change-Id: I2faad8ebe0ca81b13e29729a15515ee6b17b94b2
 2012-12-14 09:58:45 -08:00
Ying Wang
ac0de62ba3 Use LOCAL_REQUIRED_MODULES to establish dependency 
instead of using the tricky order-only dependency on a phony target
module name.

Change-Id: I691f2d352d1bd7f619bdb0b75070709e1b8222c0
 2012-12-04 12:04:44 -08:00
Jesse Hall
c342044368 Mark extensions 'Complete', correct some stale version info 
Change-Id: I46ccd8eaeacc647399a5531e262c1b01e0a080b0
 2012-11-29 16:13:10 -08:00
Jesse Hall
721192ed0d Initial draft of EGL_ANDROID_image_native_buffer 
Change-Id: If9bdd27ffdb13fb85e9ef873b311d6721399f75f
 2012-11-29 11:43:47 -08:00
Andy McFadden
db2e4f16bb am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 
* commit 'a90173d86dd209aee55d833c73c424d854a98c70':
  DO NOT MERGE - native_fence_sync: fix an enum name
 2012-11-27 11:39:20 -08:00
Andy McFadden
762a6d86de Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 2012-11-27 07:36:50 -08:00
Jamie Gennis
378787cf62 DO NOT MERGE - native_fence_sync: fix an enum name 
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".

Bug: http://code.google.com/p/android/issues/detail?id=40295

(cherry-pick from master)

Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
 2012-11-26 14:26:31 -08:00
Jamie Gennis
333fb79753 Merge "native_fence_sync: fix an enum name" 2012-11-26 14:12:12 -08:00
Jamie Gennis
e346c503ce native_fence_sync: fix an enum name 
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".

Bug: http://code.google.com/p/android/issues/detail?id=40295
Change-Id: I049b2ba185c2dbdccb8fc069701dbe805d63f645
 2012-11-26 13:54:56 -08:00
Siva Velusamy
0e34af6284 am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable. 
* commit 'c859084ca303ca1ab69bdc78f864d39c9c81ab0b':
  gltrace: Make sure device is debuggable.
 2012-11-20 20:01:30 -08:00
Siva Velusamy
a9a4cd4806 gltrace: Make sure device is debuggable. 
(cherry picked from commit 6482fa4db0)

Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
 2012-11-20 15:55:35 -08:00
Siva Velusamy
6482fa4db0 gltrace: Make sure device is debuggable. 
Change-Id: Icc22ff823a2f56733b232b927dd1fa494e9e1e81
 2012-11-20 13:39:57 -08:00
Ben Cheng
20b9749959 Disable ld --fatal-warnings because of using mktemp. 
Change-Id: Id18b1e38672294b025bc26adb38aed0ac3e0fb45
 2012-11-06 23:11:35 -08:00
Andrew Hsieh
16ac25b73a am 168dfe71: am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 
* commit '168dfe71bfafebaa26b6f75df553f5fad7607669':
  Fix return type of glGetAttribLocation and glGetUniformLocation
 2012-11-06 20:46:17 -08:00
Andrew Hsieh
5e530e02bc am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 
* commit 'a151a19db2fa07295837027fb5d84c02401cc78d':
  Fix return type of glGetAttribLocation and glGetUniformLocation
 2012-11-06 20:41:34 -08:00
Andrew Hsieh
300ad09822 Fix return type of glGetAttribLocation and glGetUniformLocation 
from int to GLint.

See:
   http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
   http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml

Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
 2012-11-06 14:39:08 -08:00
Romain Guy
d991b40739 am f58475b5: am 60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev 
* commit 'f58475b5ae4ccb3a31c05c79da8b2914c62a3510':
  Add runtime debugging capabilities to OpenGL
 2012-10-18 17:39:13 -07:00
Romain Guy
f58475b5ae am 60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev 
* commit '60393d45207b6548e1f61ca104fa59aecee87d30':
  Add runtime debugging capabilities to OpenGL
 2012-10-18 17:37:54 -07:00
Romain Guy
16928bfeca Add runtime debugging capabilities to OpenGL 
The shell property debug.egl.trace can now be set to:

0
  disables tracing
1
  logs all GL calls
error
  checks glGetError after every GL call, logs a stack trace on error
systrace
  logs each GL call to systrace

Change-Id: I34a2a2d4e19c373fd9eaa1b0cd93e67c87378996
 2012-10-18 16:16:10 -07:00
Romain Guy
4d0aec67c4 am 23bcd8d2: am 825a9a2d: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev 
* commit '23bcd8d298597659622919027c9ea921d5eed513':
  Update comments to reflect what the code actually does
 2012-10-16 09:50:35 -07:00
Romain Guy
23bcd8d298 am 825a9a2d: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev 
* commit '825a9a2dcd1b3e139dd0677ff46f966fb23f963c':
  Update comments to reflect what the code actually does
 2012-10-16 09:47:38 -07:00
Romain Guy
1ba2f61d75 am 49fe8add: am b96fe085: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev 
* commit '49fe8addbfe52bf9a3e69e6250e462a70332235c':
  Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
 2012-10-15 20:26:14 -07:00
Romain Guy
49fe8addbf am b96fe085: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev 
* commit 'b96fe08540dcf7e90be56919ea9863f687da779c':
  Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
 2012-10-15 20:19:18 -07:00
Romain Guy
be3c3e4eca Update comments to reflect what the code actually does 
Change-Id: I2613aa32c29eddc52a00090656c1bd11f9f5732b
 2012-10-15 19:25:18 -07:00
Romain Guy
1cffc80f97 Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps 
Change-Id: I53ac91a9ce07b5dd5f2ee0e3cc5b65b6402f9229
 2012-10-15 18:13:05 -07:00
Siva Velusamy
c6e8452320 Merge "gltrace: Do not start gltrace from early_egl_init." 2012-10-10 14:02:55 -07:00
Chet Haase
8420c5fbe8 am 8b75830c: am 8d5d2019: Revert "Add GL Error logs (temporary)" 
* commit '8b75830c5ce5e0097909c11c559d50d7f6f7303b':
  Revert "Add GL Error logs (temporary)"
 2012-10-10 13:22:55 -07:00
Chet Haase
8b75830c5c am 8d5d2019: Revert "Add GL Error logs (temporary)" 
* commit '8d5d2019805df1f27cbec07eeca47dd5ab453dad':
  Revert "Add GL Error logs (temporary)"
 2012-10-10 13:21:39 -07:00
Chet Haase
8d5d201980 Revert "Add GL Error logs (temporary)" 
This reverts commit 2da2c15068.
 2012-10-10 13:10:40 -07:00
Siva Velusamy
2e080904ab gltrace: Do not start gltrace from early_egl_init. 
The debugging and tracing levels are initialized both during
early_egl_init and egl_display_t::initialize(). For apps this has
no effect since early_egl_init is called in the context of zygote.
This CL removes the unnecessary call from early_egl_init.

Change-Id: Ibc55c26228cd197f2e2623fbfb2d1a63d0722401
 2012-10-10 10:35:41 -07:00
Jean-Baptiste Queru
76942a4974 Merge "egl: Reintroduce eglGetRenderBufferANDROID" 2012-10-05 13:14:29 -07:00
Chet Haase
b39844e251 am 9c58d96f: am 27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev 
* commit '9c58d96f0079e627004c606436df27fa97ff4c8e':
  Add GL Error logs (temporary)
 2012-10-04 20:34:36 -07:00
Chet Haase
9c58d96f00 am 27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev 
* commit '27b28fd9960b73a1f13e22dd6655f75e2e76eef7':
  Add GL Error logs (temporary)
 2012-10-04 19:48:12 -07:00
Chet Haase
2da2c15068 Add GL Error logs (temporary) 
Adding logs to tell which specific methods throw OpenGL errors.

Change-Id: I1d73c7566ed1ea6610392020411762c6255a0ede
 2012-10-04 17:15:59 -07:00
Siva Velusamy
090503a01c gltrace: Fix NPE 
Change-Id: Id7af9cd388f3508201f96a0624966c2ce01b4da5
 2012-10-01 14:30:48 -07:00
Chet Haase
4cb9e0062e am bba6bb81: am 4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev 
* commit 'bba6bb81373b285b456bb851d37f7f2ecfc742ad':
  Re-enable FAST_TLS in gl2 code
 2012-09-28 12:42:21 -07:00
Chet Haase
bba6bb8137 am 4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev 
* commit '4c2732779a11c92222958e7150162d4eaaab7b66':
  Re-enable FAST_TLS in gl2 code
 2012-09-28 12:41:24 -07:00
Chet Haase
e8b0fac720 Re-enable FAST_TLS in gl2 code 
Temporarily changed USE_FAST_TLS_KEY ifdef during debugging. Changing it
back now.

Change-Id: I7c2fcf7265b3d545e31ff7683bd7614100fad3e5
 2012-09-28 11:56:48 -07:00
Romain Guy
f51c798c03 am e1549fcb: am cb094a78: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev 
* commit 'e1549fcb4493fe84deb488d85fc626d635153eb8':
  New compile-time flags to make debugging easier for us poor souls Bug #7195815
 2012-09-28 00:35:10 -07:00
Romain Guy
e1549fcb44 am cb094a78: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev 
* commit 'cb094a783f14daae3378ac8aa7dc509980f037b2':
  New compile-time flags to make debugging easier for us poor souls Bug #7195815
 2012-09-27 16:05:31 -07:00
Romain Guy
f12fe43e8c New compile-time flags to make debugging easier for us poor souls 
Bug #7195815

Change-Id: I23e7ac991891b9586cb8ed20b1305c8b1b3e2b43
 2012-09-27 15:47:10 -07:00
Mathias Agopian
b428bf60a3 am 2ac41948: am 1e83690c: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev 
* commit '2ac4194854a70c6e319b1b3b647344e595082b38':
  assert -eng builds when calling a GL function without a context
 2012-09-26 18:51:49 -07:00
Mathias Agopian
2ac4194854 am 1e83690c: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev 
* commit '1e83690c6030b33c7776fa65cb57132d5e2d0b40':
  assert -eng builds when calling a GL function without a context
 2012-09-26 18:50:13 -07:00