aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update ADT version to 24.0.0." into studio-1.0-devTor Norbye2014-12-0353-77/+77
|\
| * Update ADT version to 24.0.0.Tor Norbye2014-12-0353-77/+77
| | | | | | | | Change-Id: I35126be74bfbbafb3c7acb047b8dc0076bd3b669
* | Merge "Update SDK tools version to 24.0.0." into studio-1.0-devTor Norbye2014-12-031-1/+1
|\ \ | |/
| * Update SDK tools version to 24.0.0.Tor Norbye2014-12-031-1/+1
|/ | | | Change-Id: I402888c46408c81faef34a547ba54b19a78f77e5
* Merge "80481: Update Gradle Export from Eclipse to handle 1.0" into ↵Tor Norbye2014-12-023-7/+8
|\ | | | | | | studio-1.0-dev
| * 80481: Update Gradle Export from Eclipse to handle 1.0Tor Norbye2014-12-023-7/+8
|/ | | | Change-Id: Ib62817d9c906adf8d893773027a34590a2bf56ed
* Merge "Update ADT version to 23.0.6" into studio-1.0-devTor Norbye2014-12-0253-77/+77
|\
| * Update ADT version to 23.0.6Tor Norbye2014-11-2653-77/+77
| | | | | | | | Change-Id: I23d62d1778b798711d1ad666db3bead193f90ef2
* | Merge "72760: Lint errors prevent exporting of application" into studio-1.0-devTor Norbye2014-12-017-11/+78
|\ \ | |/
| * 72760: Lint errors prevent exporting of applicationTor Norbye2014-11-267-11/+78
|/ | | | Change-Id: I710982520f2ac40674dca7f63760f525051342a2
* Merge "Correctly set error code" into studio-1.0-devbohu2014-11-252-4/+28
|\
| * Correctly set error codebohu2014-11-252-4/+28
| | | | | | | | | | | | Fixed a few error codes to be more accurate Change-Id: Ifad6bf51c399215a9110bd40cfd380309ac6422c
* | Merge "Validate glClear mask" into studio-1.0-devbohu2014-11-251-0/+3
|\ \ | |/
| * Validate glClear maskbohu2014-11-251-0/+3
| | | | | | | | | | | | | | The mask should only be a combination of GL_DEPTH_BUFFER_BIT, GL_COLOR_BUFFER_BIT, and GL_STENCIL_BUFFER_BIT Change-Id: Ic448bd33a9bf0dc50db4298a53e96dd128fd110c
* | Merge "Check and return correct error code" into studio-1.0-devbohu2014-11-251-3/+5
|\ \ | |/
| * Check and return correct error codebohu2014-11-251-3/+5
| | | | | | | | | | | | | | | | check and return proper error codes when negative width, height or size or wrong internal texture format is passed in. Change-Id: Ic4ddea55042d8e21f8729a7ca675a44a232b7c7c
* | Merge "validate glBufferData's usage parameter" into studio-1.0-devbohu2014-11-253-0/+12
|\ \ | |/
| * validate glBufferData's usage parameterbohu2014-11-253-0/+12
| | | | | | | | | | | | | | Only GL_STREAM_DRAW, GL_STATIC_DRAW and GL_DYNAMIC_DRAW usages are allowed. Change-Id: I2d6a425363c32330d25272d26884d32610d8dd19
* | Merge "Detach texture or renderbuffer when deleting them" into studio-1.0-devbohu2014-11-252-1/+29
|\ \ | |/
| * Detach texture or renderbuffer when deleting thembohu2014-11-252-1/+29
| | | | | | | | | | | | | | When a texture or renderbuffer is still attached to framebuffer but is getting deleted, it should also be detached from framebuffer. Change-Id: Ide2c2a0e36ca8bf58f9351a17b78b76ebd507c12
* | Merge "emulator/opengl: Fix glShaderSource() signature." into studio-1.0-devBo Hu2014-11-2510-9/+10
|\ \ | |/
| * emulator/opengl: Fix glShaderSource() signature.David 'Digit' Turner2014-11-2510-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The glShaderSource() function really takes a 'const GLchar* const*' parameter, not 'const GLchar**'. This creates issues when compiling the auto-generated encoders created with the latest version of 'emugen' and the GL2 Khronos headers. This patch is used to fix the issue. Note that it requires defining a new type in gl2.types, as well as fixing the signature of misc functions in the translator. Change-Id: I750f95f2e33d83b3b5563642ad7f87e4b8a37f35
* | Merge "emulator/opengl/emugen: Add new 'flushOnEncode' entry point flag." ↵Bo Hu2014-11-2522-2/+71
|\ \ | |/ | | | | into studio-1.0-dev
| * emulator/opengl/emugen: Add new 'flushOnEncode' entry point flag.David 'Digit' Turner2014-11-2522-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new flag that can be applied to entry points for 'emugen', named 'flushOnEncode'. When used, the generated encoder will call stream->flush() just after adding bytes to the stream. This is needed to match the manual change that was performed in the renderControl encoder in the following patch: https://android-review.googlesource.com/#/c/95864/ Change-Id: I8cc8fdb0d38ef27e8ba646c83d717166400babfd
* | Merge "emulator/opengl: Remove compiler warnings." into studio-1.0-devBo Hu2014-11-253-2/+4
|\ \ | |/
| * emulator/opengl: Remove compiler warnings.David 'Digit' Turner2014-11-253-2/+4
| | | | | | | | | | | | | | | | | | | | This patch ensures that the auto-generated client_context.h headers do not generate compiler warnings in the setError() function. + Remove tiny warning for NativeLinuxSubWindow.cpp Change-Id: Ibab92ab3332fd284589435732b52c011ae21c15f
* | Merge "emulator/opengl/emugen: Small cleanup of autogenerated sources." into ↵Bo Hu2014-11-257-52/+49
|\ \ | |/ | | | | studio-1.0-dev
| * emulator/opengl/emugen: Small cleanup of autogenerated sources.David 'Digit' Turner2014-11-257-52/+49
| | | | | | | | | | | | | | | | | | | | | | | | This patch ensures the generated sources are cleaned up a little bit, more specifically: - Add proper end-ifdef-guard comments. - Use anonymous C++ namespaces to avoid name conflicts in the encoder. - Remove extra spaces / empty lines / indent. - Use 'const' when defining constant tables. Change-Id: Ib11fd06adb9075d472d1dd2fd6defb0760aaa2c2
* | Merge "emulator/opengl: Add emugen test suite." into studio-1.0-devBo Hu2014-11-2522-0/+629
|\ \ | |/
| * emulator/opengl: Add emugen test suite.David 'Digit' Turner2014-11-2522-0/+629
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a small test suite to check the output of the 'emugen' program. This serves two purposes: 1) To more easily check that modifications to 'emugen' do not break stuff liberally. 2) To better document how the changes in the generator actually modify the output. To run it, simply call the 'run-tests.sh' script with 'emugen' in your path, or use --emugen=<program> otherwise. See --help for more details. NOTE: The test suite currently doesn't check that the generated sources compile properly, or that they even work as expected. See the following external/qemu patch to call run-tests.sh during each android-rebuild.sh run: https://android-review.googlesource.com/112541 Change-Id: I148e456ce726bda7168d433e407fe967959839f6
* | Merge "emulator/opengl/emugen: Use local variables for parameters." into ↵Bo Hu2014-11-251-83/+100
|\ \ | |/ | | | | studio-1.0-dev
| * emulator/opengl/emugen: Use local variables for parameters.David 'Digit' Turner2014-11-251-83/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the generated decoder to extract paramters from the stream into local variables, the rules are: - non-pointer parameters are extracted into local variables named "var_<name>", where <name> is the parameter name as it appears in the protocol specification for the entry. - for input pointers, use "inptr_<name>", as well as "size_<name>" for the corresponding size in bytes. - for output pointers, use "outptr_<name>" and "size_<name>" This makes the generated code easier to understand, for example the following: case OP_glBindAttribLocation: { size_t tmpPtr2Size = (size_t)*(uint32_t *)(ptr + 8 + 4 + 4); InputBuffer tmpPtr2(ptr + 8 + 4 + 4 + 4, tmpPtr2Size); DEBUG("gl2(%p): glBindAttribLocation(%u %u %p(%u) )\n", stream,Unpack<GLuint,uint32_t>(ptr + 8), Unpack<GLuint,uint32_t>(ptr + 8 + 4), (const GLchar*)(tmpPtr2.get()), (uint32_t)tmpPtr2Size); this->glBindAttribLocation(Unpack<GLuint,uint32_t>(ptr + 8), Unpack<GLuint,uint32_t>(ptr + 8 + 4), (const GLchar*)(tmpPtr2.get())); SET_LASTCALL("glBindAttribLocation"); break; } becomes: case OP_glBindAttribLocation: { GLuint var_program = Unpack<GLuint,uint32_t>(ptr + 8); GLuint var_index = Unpack<GLuint,uint32_t>(ptr + 8 + 4); uint32_t size_name = Unpack<uint32_t,uint32_t>(ptr + 8 + 4 + 4); InputBuffer inptr_name(ptr + 8 + 4 + 4 + 4, size_name); DEBUG("gl2(%p): glBindAttribLocation(%u %u %p(%u) )\n", stream,var_program, var_index, (const GLchar*)(inptr_name.get()), size_name); this->glBindAttribLocation(var_program, var_index, (const GLchar*)(inptr_name.get())); SET_LASTCALL("glBindAttribLocation"); break; } Change-Id: Ifa8c73eec85b818d6d8b6371587da9fdfa57de8e
* | Merge "emulator/opengl/emugen: Move pointer increment out of case ↵Bo Hu2014-11-251-8/+9
|\ \ | |/ | | | | statements." into studio-1.0-dev
| * emulator/opengl/emugen: Move pointer increment out of case statements.David 'Digit' Turner2014-11-251-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor patch that ensures that the pointer/position increment all happen at one place, instead of being replicated in each case statement. In other words, the generated code used to look like: switch (opcode) { case OP_someOperation1: { ... ptr += *(uint32_t)(ptr + 4); pos += *(uint32_t)(ptr + 4); break; } case OP_someOperation2: { ... ptr += *(uint32_t)(ptr + 4); pos += *(uint32_t)(ptr + 4); break; } ... default: { unknownOpcode = true; } Now it looks like: switch (opcode) { case OP_someOperation1: { ... break; } case OP_someOperation2: { ... break; } ... default: { unknownOpcode = true; } if (!unknownOpcode) { ptr += packetLen; pos += packetLen; } Which is cleaner. Also change the type of |opcode| and |packetLen| to uint32_t and size_t respectively. + Minor formatting changes to indentation. Change-Id: If0002fe18a24b9ce6691e3e3cd3e102d1e00d4c9
* | Merge "emulator/opengl/emugen: Introduce helper macros." into studio-1.0-devBo Hu2014-11-251-8/+17
|\ \ | |/
| * emulator/opengl/emugen: Introduce helper macros.David 'Digit' Turner2014-11-251-8/+17
| | | | | | | | | | | | | | | | This patch introduces two helper macros in the generated decoder to make its source code slightly more readable (DEBUG and SET_LASCALL). Change-Id: I6659fe69a5533e5194d8db5f1882abaf1a5daee5
* | Merge "emulator/opengl/emugen: Remove accessor functions." into studio-1.0-devBo Hu2014-11-254-79/+66
|\ \ | |/
| * emulator/opengl/emugen: Remove accessor functions.David 'Digit' Turner2014-11-254-79/+66
| | | | | | | | | | | | | | | | This patch simplifies the generated encoders and decoders by getting rid of the accessor functions (e.g. set_glDrawElementsData) given that all fields are public and can be written to directly. Change-Id: I15f4caac95e4d5f1e24a1a5838622600c6bc3207
* | Merge "emulator/opengl/emugen: Ensure correct buffer alignment." into ↵Bo Hu2014-11-252-4/+149
|\ \ | |/ | | | | studio-1.0-dev
| * emulator/opengl/emugen: Ensure correct buffer alignment.David 'Digit' Turner2014-11-252-4/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The decoders generated by emugen pass addresses that come directly from the stream to EGL/GL functions. Sometimes, these addresses are not properly padded with regards to the type of data being transfered and this can crash some implementations (e.g. OSMesa being compiled with -msse by default, and doesn't build without it). This patch introduces two helper classes in ProtocolUtils.h, named InputBuffer and OutputBuffer, which are used to auto-align buffer pointers, then make the generated decoder code use them. Change-Id: I345c7eecc230f62310ced5378b6344f419647e06
* | Merge "emulator/opengl/emgen: Fix debug output of floating point values." ↵Bo Hu2014-11-251-7/+2
|\ \ | |/ | | | | into studio-1.0-dev
| * emulator/opengl/emgen: Fix debug output of floating point values.David 'Digit' Turner2014-11-251-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | When calling printf() with a "%f", the value passed must be a double, not a float, which means we can't just pass a 32-bit value in the stack and assume printf() will cast it to a float properly. This results in bogus values printed whenever a GLfloat is used in a function signature, due to invalid stack offsets used by the printf(). Fix the problem by using Unpack<>() template. Change-Id: I282d9c07af68457f32af477435e5dc1999267d39
* | Merge "emulator/opengl: Add UniqueIntegerMap class." into studio-1.0-devBo Hu2014-11-253-0/+329
|\ \ | |/
| * emulator/opengl: Add UniqueIntegerMap class.David 'Digit' Turner2014-11-253-0/+329
| | | | | | | | | | | | | | | | This helper class will be used by future patches to map arbitraty opaque 'void*' values (e.g. EGLImage values) to 32-bit unique values that can be sent through the wire protocol. Change-Id: I5b17a1f230e5f9f8b905af66ba79b312f3f01e55
* | Merge "emulator/opengl/emugen: Use templates to read values from stream." ↵Bo Hu2014-11-252-73/+249
|\ \ | |/ | | | | into studio-1.0-dev
| * emulator/opengl/emugen: Use templates to read values from stream.David 'Digit' Turner2014-11-252-73/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The decoder didn't properly handle GLsizeiptr and GLintptr values, which are always 32-bit on the wire, but can be 64-bit on the host. I.e. it did something like that to read them from the stream: *(GLsizeiptr*)(ptr + offset) This fixes the issue by using templates to generate host-type-specific functions that properly read data from the stream and convert it to the appropriate host type. Change-Id: I75749bd715456ca143eb1713498f7cf635918801
* | Merge "emulator/opengl/emugen: Get rid of VarConverter." into studio-1.0-devBo Hu2014-11-252-72/+45
|\ \ | |/
| * emulator/opengl/emugen: Get rid of VarConverter.David 'Digit' Turner2014-11-252-72/+45
| | | | | | | | | | | | | | | | This patch simplifies VarType.h a bit, since there is no point in having a specialized class like VarConverter to essentially hold what is a size in bytes! Change-Id: Idbba469a8594d1e964bbe79bbbea65934c42c033
* | Merge "emulator/opengl/emugl: Remove ispointer field from types ↵Bo Hu2014-11-254-95/+101
|\ \ | |/ | | | | definitions." into studio-1.0-dev
| * emulator/opengl/emugl: Remove ispointer field from types definitions.David 'Digit' Turner2014-11-254-95/+101
|/ | | | Change-Id: I3b4b5510eb5d5cb379f7a498b58b4adb6417290b
generated by cgit v1.1 at 2025-01-15 10:36:41 +0000