summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuan Song <huans@google.com>2021-05-03 18:34:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-03 18:34:37 +0000
commit9712586ece428535595d9c68519d9f905d253fe8 (patch)
tree8132cebdb402cd8cca4b82a273d01e118ff16879
parent95404f050a0dd21f2d230f921f576991f0443203 (diff)
parentba378e49ae8e2ae84d78eef685034994e2d4fc6d (diff)
downloadvulkan-cereal-9712586ece428535595d9c68519d9f905d253fe8.tar.gz
New API generated. am: 679c6dd5cf am: 5bf9fef623 am: ba378e49ae
Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/1692786 Change-Id: I07bff6a45a43a74954d8b140d93c26d8cd6f55e3
-rw-r--r--stream-servers/renderControl_dec/renderControl_dec.cpp43
-rw-r--r--stream-servers/renderControl_dec/renderControl_opcodes.h4
-rw-r--r--stream-servers/renderControl_dec/renderControl_server_context.cpp2
-rw-r--r--stream-servers/renderControl_dec/renderControl_server_context.h2
-rw-r--r--stream-servers/renderControl_dec/renderControl_server_proc.h2
5 files changed, 52 insertions, 1 deletions
diff --git a/stream-servers/renderControl_dec/renderControl_dec.cpp b/stream-servers/renderControl_dec/renderControl_dec.cpp
index 9f859ce3..8b275620 100644
--- a/stream-servers/renderControl_dec/renderControl_dec.cpp
+++ b/stream-servers/renderControl_dec/renderControl_dec.cpp
@@ -1222,6 +1222,49 @@ size_t renderControl_decoder_context_t::decode(void *buf, size_t len, IOStream *
android::base::endTrace();
break;
}
+ case OP_rcCreateDisplayById: {
+ android::base::beginTrace("rcCreateDisplayById decode");
+ uint32_t var_displayId = Unpack<uint32_t,uint32_t>(ptr + 8);
+ if (useChecksum) {
+ ChecksumCalculatorThreadInfo::validOrDie(checksumCalc, ptr, 8 + 4, ptr + 8 + 4, checksumSize,
+ "renderControl_decoder_context_t::decode, OP_rcCreateDisplayById: GL checksumCalculator failure\n");
+ }
+ size_t totalTmpSize = sizeof(int);
+ totalTmpSize += checksumSize;
+ unsigned char *tmpBuf = stream->alloc(totalTmpSize);
+ *(int *)(&tmpBuf[0]) = this->rcCreateDisplayById(var_displayId);
+ if (useChecksum) {
+ ChecksumCalculatorThreadInfo::writeChecksum(checksumCalc, &tmpBuf[0], totalTmpSize - checksumSize, &tmpBuf[totalTmpSize - checksumSize], checksumSize);
+ }
+ stream->flush();
+ SET_LASTCALL("rcCreateDisplayById");
+ android::base::endTrace();
+ break;
+ }
+ case OP_rcSetDisplayPoseDpi: {
+ android::base::beginTrace("rcSetDisplayPoseDpi decode");
+ uint32_t var_displayId = Unpack<uint32_t,uint32_t>(ptr + 8);
+ GLint var_x = Unpack<GLint,uint32_t>(ptr + 8 + 4);
+ GLint var_y = Unpack<GLint,uint32_t>(ptr + 8 + 4 + 4);
+ uint32_t var_w = Unpack<uint32_t,uint32_t>(ptr + 8 + 4 + 4 + 4);
+ uint32_t var_h = Unpack<uint32_t,uint32_t>(ptr + 8 + 4 + 4 + 4 + 4);
+ uint32_t var_dpi = Unpack<uint32_t,uint32_t>(ptr + 8 + 4 + 4 + 4 + 4 + 4);
+ if (useChecksum) {
+ ChecksumCalculatorThreadInfo::validOrDie(checksumCalc, ptr, 8 + 4 + 4 + 4 + 4 + 4 + 4, ptr + 8 + 4 + 4 + 4 + 4 + 4 + 4, checksumSize,
+ "renderControl_decoder_context_t::decode, OP_rcSetDisplayPoseDpi: GL checksumCalculator failure\n");
+ }
+ size_t totalTmpSize = sizeof(int);
+ totalTmpSize += checksumSize;
+ unsigned char *tmpBuf = stream->alloc(totalTmpSize);
+ *(int *)(&tmpBuf[0]) = this->rcSetDisplayPoseDpi(var_displayId, var_x, var_y, var_w, var_h, var_dpi);
+ if (useChecksum) {
+ ChecksumCalculatorThreadInfo::writeChecksum(checksumCalc, &tmpBuf[0], totalTmpSize - checksumSize, &tmpBuf[totalTmpSize - checksumSize], checksumSize);
+ }
+ stream->flush();
+ SET_LASTCALL("rcSetDisplayPoseDpi");
+ android::base::endTrace();
+ break;
+ }
default:
return ptr - (unsigned char*)buf;
} //switch
diff --git a/stream-servers/renderControl_dec/renderControl_opcodes.h b/stream-servers/renderControl_dec/renderControl_opcodes.h
index a3a6e27c..732d3e03 100644
--- a/stream-servers/renderControl_dec/renderControl_opcodes.h
+++ b/stream-servers/renderControl_dec/renderControl_opcodes.h
@@ -65,7 +65,9 @@
#define OP_rcDestroySyncKHRAsync 10059
#define OP_rcComposeWithoutPost 10060
#define OP_rcComposeAsyncWithoutPost 10061
-#define OP_last 10062
+#define OP_rcCreateDisplayById 10062
+#define OP_rcSetDisplayPoseDpi 10063
+#define OP_last 10064
#endif
diff --git a/stream-servers/renderControl_dec/renderControl_server_context.cpp b/stream-servers/renderControl_dec/renderControl_server_context.cpp
index 60ca587a..c6cbf234 100644
--- a/stream-servers/renderControl_dec/renderControl_server_context.cpp
+++ b/stream-servers/renderControl_dec/renderControl_server_context.cpp
@@ -72,6 +72,8 @@ int renderControl_server_context_t::initDispatchByName(void *(*getProc)(const ch
rcDestroySyncKHRAsync = (rcDestroySyncKHRAsync_server_proc_t) getProc("rcDestroySyncKHRAsync", userData);
rcComposeWithoutPost = (rcComposeWithoutPost_server_proc_t) getProc("rcComposeWithoutPost", userData);
rcComposeAsyncWithoutPost = (rcComposeAsyncWithoutPost_server_proc_t) getProc("rcComposeAsyncWithoutPost", userData);
+ rcCreateDisplayById = (rcCreateDisplayById_server_proc_t) getProc("rcCreateDisplayById", userData);
+ rcSetDisplayPoseDpi = (rcSetDisplayPoseDpi_server_proc_t) getProc("rcSetDisplayPoseDpi", userData);
return 0;
}
diff --git a/stream-servers/renderControl_dec/renderControl_server_context.h b/stream-servers/renderControl_dec/renderControl_server_context.h
index fdd46d03..f151288b 100644
--- a/stream-servers/renderControl_dec/renderControl_server_context.h
+++ b/stream-servers/renderControl_dec/renderControl_server_context.h
@@ -72,6 +72,8 @@ struct renderControl_server_context_t {
rcDestroySyncKHRAsync_server_proc_t rcDestroySyncKHRAsync;
rcComposeWithoutPost_server_proc_t rcComposeWithoutPost;
rcComposeAsyncWithoutPost_server_proc_t rcComposeAsyncWithoutPost;
+ rcCreateDisplayById_server_proc_t rcCreateDisplayById;
+ rcSetDisplayPoseDpi_server_proc_t rcSetDisplayPoseDpi;
virtual ~renderControl_server_context_t() {}
int initDispatchByName( void *(*getProc)(const char *name, void *userData), void *userData);
};
diff --git a/stream-servers/renderControl_dec/renderControl_server_proc.h b/stream-servers/renderControl_dec/renderControl_server_proc.h
index 50f25aeb..84d192a8 100644
--- a/stream-servers/renderControl_dec/renderControl_server_proc.h
+++ b/stream-servers/renderControl_dec/renderControl_server_proc.h
@@ -74,6 +74,8 @@ typedef void (renderControl_APIENTRY *rcComposeAsync_server_proc_t) (uint32_t, v
typedef void (renderControl_APIENTRY *rcDestroySyncKHRAsync_server_proc_t) (uint64_t);
typedef GLint (renderControl_APIENTRY *rcComposeWithoutPost_server_proc_t) (uint32_t, void*);
typedef void (renderControl_APIENTRY *rcComposeAsyncWithoutPost_server_proc_t) (uint32_t, void*);
+typedef int (renderControl_APIENTRY *rcCreateDisplayById_server_proc_t) (uint32_t);
+typedef int (renderControl_APIENTRY *rcSetDisplayPoseDpi_server_proc_t) (uint32_t, GLint, GLint, uint32_t, uint32_t, uint32_t);
#endif