Fix Chromium's swiftshader_unittests
Windows module-definition file's LIBRARY section determines the name
of the DLL: https://docs.microsoft.com/en-us/cpp/build/reference/library?view=msvc-160
Hence we should still use the previous non-deprecated .def files in our
GN builds.
Fixes: b/197371222
Change-Id: I8b8979c11db7ad410b1bdf243ee0862873fe94b8
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/56548
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Commit-Queue: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/OpenGL/libEGL/BUILD.gn b/src/OpenGL/libEGL/BUILD.gn
index 5ab373e..9dd8b9e 100644
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -64,7 +64,7 @@
if (is_win) {
sources += [
- "libEGL_deprecated.def",
+ "libEGL.def",
"libEGL.rc",
]
}
diff --git a/src/OpenGL/libEGL/libEGL.def b/src/OpenGL/libEGL/libEGL.def
new file mode 100644
index 0000000..525099e
--- /dev/null
+++ b/src/OpenGL/libEGL/libEGL.def
@@ -0,0 +1,49 @@
+LIBRARY libEGL
+EXPORTS
+ eglBindAPI @14
+ eglBindTexImage @20
+ eglChooseConfig @7
+ eglCopyBuffers @33
+ eglCreateContext @23
+ eglCreatePbufferFromClientBuffer @18
+ eglCreatePbufferSurface @10
+ eglCreatePixmapSurface @11
+ eglCreateWindowSurface @9
+ eglDestroyContext @24
+ eglDestroySurface @12
+ eglGetConfigAttrib @8
+ eglGetConfigs @6
+ eglGetCurrentContext @26
+ eglGetCurrentDisplay @28
+ eglGetCurrentSurface @27
+ eglGetDisplay @2
+ eglGetError @1
+ eglGetProcAddress @34
+ eglInitialize @3
+ eglMakeCurrent @25
+ eglQueryAPI @15
+ eglQueryContext @29
+ eglQueryString @5
+ eglQuerySurface @13
+ eglReleaseTexImage @21
+ eglReleaseThread @17
+ eglSurfaceAttrib @19
+ eglSwapBuffers @32
+ eglSwapInterval @22
+ eglTerminate @4
+ eglWaitClient @16
+ eglWaitGL @30
+ eglWaitNative @31
+
+ ; Extensions
+ eglCreateImageKHR
+ eglDestroyImageKHR
+ eglGetPlatformDisplayEXT
+ eglCreatePlatformWindowSurfaceEXT
+ eglCreatePlatformPixmapSurfaceEXT
+ eglCreateSyncKHR
+ eglDestroySyncKHR
+ eglClientWaitSyncKHR
+ eglGetSyncAttribKHR
+
+ libEGL_swiftshader
diff --git a/src/OpenGL/libGLESv2/BUILD.gn b/src/OpenGL/libGLESv2/BUILD.gn
index f203caa..65668f2 100644
--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -119,7 +119,7 @@
if (is_win) {
sources += [
- "libGLESv2_deprecated.def",
+ "libGLESv2.def",
"libGLESv2.rc",
]
}
diff --git a/src/OpenGL/libGLESv2/libGLESv2.def b/src/OpenGL/libGLESv2/libGLESv2.def
new file mode 100644
index 0000000..485f6c3
--- /dev/null
+++ b/src/OpenGL/libGLESv2/libGLESv2.def
@@ -0,0 +1,297 @@
+LIBRARY libGLESv2
+EXPORTS
+ glActiveTexture @1
+ glAttachShader @2
+ glBindAttribLocation @3
+ glBindBuffer @4
+ glBindFramebuffer @5
+ glBindRenderbuffer @6
+ glBindTexture @7
+ glBlendColor @8
+ glBlendEquation @9
+ glBlendEquationSeparate @10
+ glBlendFunc @11
+ glBlendFuncSeparate @12
+ glBufferData @13
+ glBufferSubData @14
+ glCheckFramebufferStatus @15
+ glClear @16
+ glClearColor @17
+ glClearDepthf @18
+ glClearStencil @19
+ glColorMask @20
+ glCompileShader @21
+ glCompressedTexImage2D @22
+ glCompressedTexSubImage2D @23
+ glCopyTexImage2D @24
+ glCopyTexSubImage2D @25
+ glCreateProgram @26
+ glCreateShader @27
+ glCullFace @28
+ glDeleteBuffers @29
+ glDeleteFramebuffers @30
+ glDeleteProgram @32
+ glDeleteRenderbuffers @33
+ glDeleteShader @34
+ glDeleteTextures @31
+ glDepthFunc @36
+ glDepthMask @37
+ glDepthRangef @38
+ glDetachShader @35
+ glDisable @39
+ glDisableVertexAttribArray @40
+ glDrawArrays @41
+ glDrawElements @42
+ glEnable @43
+ glEnableVertexAttribArray @44
+ glFinish @45
+ glFlush @46
+ glFramebufferRenderbuffer @47
+ glFramebufferTexture2D @48
+ glFrontFace @49
+ glGenBuffers @50
+ glGenFramebuffers @52
+ glGenRenderbuffers @53
+ glGenTextures @54
+ glGenerateMipmap @51
+ glGetActiveAttrib @55
+ glGetActiveUniform @56
+ glGetAttachedShaders @57
+ glGetAttribLocation @58
+ glGetBooleanv @59
+ glGetBufferParameteriv @60
+ glGetError @61
+ glGetFloatv @62
+ glGetFramebufferAttachmentParameteriv @63
+ glGetIntegerv @64
+ glGetProgramInfoLog @66
+ glGetProgramiv @65
+ glGetRenderbufferParameteriv @67
+ glGetShaderInfoLog @69
+ glGetShaderPrecisionFormat @70
+ glGetShaderSource @71
+ glGetShaderiv @68
+ glGetString @72
+ glGetTexParameterfv @73
+ glGetTexParameteriv @74
+ glGetUniformLocation @77
+ glGetUniformfv @75
+ glGetUniformiv @76
+ glGetVertexAttribPointerv @80
+ glGetVertexAttribfv @78
+ glGetVertexAttribiv @79
+ glHint @81
+ glIsBuffer @82
+ glIsEnabled @83
+ glIsFramebuffer @84
+ glIsProgram @85
+ glIsRenderbuffer @86
+ glIsShader @87
+ glIsTexture @88
+ glLineWidth @89
+ glLinkProgram @90
+ glPixelStorei @91
+ glPolygonOffset @92
+ glReadPixels @93
+ glReleaseShaderCompiler @94
+ glRenderbufferStorage @95
+ glSampleCoverage @96
+ glScissor @97
+ glShaderBinary @98
+ glShaderSource @99
+ glStencilFunc @100
+ glStencilFuncSeparate @101
+ glStencilMask @102
+ glStencilMaskSeparate @103
+ glStencilOp @104
+ glStencilOpSeparate @105
+ glTexImage2D @106
+ glTexParameterf @107
+ glTexParameterfv @108
+ glTexParameteri @109
+ glTexParameteriv @110
+ glTexSubImage2D @111
+ glUniform1f @112
+ glUniform1fv @113
+ glUniform1i @114
+ glUniform1iv @115
+ glUniform2f @116
+ glUniform2fv @117
+ glUniform2i @118
+ glUniform2iv @119
+ glUniform3f @120
+ glUniform3fv @121
+ glUniform3i @122
+ glUniform3iv @123
+ glUniform4f @124
+ glUniform4fv @125
+ glUniform4i @126
+ glUniform4iv @127
+ glUniformMatrix2fv @128
+ glUniformMatrix3fv @129
+ glUniformMatrix4fv @130
+ glUseProgram @131
+ glValidateProgram @132
+ glVertexAttrib1f @133
+ glVertexAttrib1fv @134
+ glVertexAttrib2f @135
+ glVertexAttrib2fv @136
+ glVertexAttrib3f @137
+ glVertexAttrib3fv @138
+ glVertexAttrib4f @139
+ glVertexAttrib4fv @140
+ glVertexAttribPointer @141
+ glViewport @142
+
+ ; Extensions
+ glTexImage3DOES
+ glBlitFramebufferANGLE
+ glRenderbufferStorageMultisampleANGLE
+ glDeleteFencesNV
+ glFinishFenceNV
+ glGenFencesNV
+ glGetFenceivNV
+ glIsFenceNV
+ glSetFenceNV
+ glTestFenceNV
+ glGetGraphicsResetStatusEXT
+ glReadnPixelsEXT
+ glGetnUniformfvEXT
+ glGetnUniformivEXT
+ glGenQueriesEXT
+ glDeleteQueriesEXT
+ glIsQueryEXT
+ glBeginQueryEXT
+ glEndQueryEXT
+ glGetQueryivEXT
+ glGetQueryObjectuivEXT
+ glEGLImageTargetTexture2DOES
+ glEGLImageTargetRenderbufferStorageOES
+ glIsRenderbufferOES
+ glBindRenderbufferOES
+ glDeleteRenderbuffersOES
+ glGenRenderbuffersOES
+ glRenderbufferStorageOES
+ glGetRenderbufferParameterivOES
+ glIsFramebufferOES
+ glBindFramebufferOES
+ glDeleteFramebuffersOES
+ glGenFramebuffersOES
+ glCheckFramebufferStatusOES
+ glFramebufferRenderbufferOES
+ glFramebufferTexture2DOES
+ glGetFramebufferAttachmentParameterivOES
+ glGenerateMipmapOES
+ glDrawBuffersEXT
+ glBindVertexArrayOES
+ glDeleteVertexArraysOES
+ glGenVertexArraysOES
+ glIsVertexArrayOES
+
+ ; GLES 3.0 Functions
+ glReadBuffer @211
+ glDrawRangeElements @212
+ glTexImage3D @213
+ glTexSubImage3D @214
+ glCopyTexSubImage3D @215
+ glCompressedTexImage3D @216
+ glCompressedTexSubImage3D @217
+ glGenQueries @218
+ glDeleteQueries @219
+ glIsQuery @220
+ glBeginQuery @221
+ glEndQuery @222
+ glGetQueryiv @223
+ glGetQueryObjectuiv @224
+ glUnmapBuffer @204
+ glGetBufferPointerv @205
+ glDrawBuffers @225
+ glUniformMatrix2x3fv @226
+ glUniformMatrix3x2fv @227
+ glUniformMatrix2x4fv @228
+ glUniformMatrix4x2fv @229
+ glUniformMatrix3x4fv @230
+ glUniformMatrix4x3fv @231
+ glBlitFramebuffer @232
+ glRenderbufferStorageMultisample @305
+ glFramebufferTextureLayer @233
+ glMapBufferRange @307
+ glFlushMappedBufferRange @234
+ glBindVertexArray @206
+ glDeleteVertexArrays @207
+ glGenVertexArrays @208
+ glIsVertexArray @209
+ glGetIntegeri_v @235
+ glBeginTransformFeedback @236
+ glEndTransformFeedback @237
+ glBindBufferRange @238
+ glBindBufferBase @239
+ glTransformFeedbackVaryings @240
+ glGetTransformFeedbackVarying @241
+ glVertexAttribIPointer @242
+ glGetVertexAttribIiv @243
+ glGetVertexAttribIuiv @244
+ glVertexAttribI4i @245
+ glVertexAttribI4ui @246
+ glVertexAttribI4iv @247
+ glVertexAttribI4uiv @248
+ glGetUniformuiv @249
+ glGetFragDataLocation @309
+ glUniform1ui @250
+ glUniform2ui @251
+ glUniform3ui @252
+ glUniform4ui @253
+ glUniform1uiv @254
+ glUniform2uiv @255
+ glUniform3uiv @256
+ glUniform4uiv @257
+ glClearBufferiv @258
+ glClearBufferuiv @259
+ glClearBufferfv @260
+ glClearBufferfi @261
+ glGetStringi @262
+ glCopyBufferSubData @263
+ glGetUniformIndices @264
+ glGetActiveUniformsiv @265
+ glGetUniformBlockIndex @267
+ glGetActiveUniformBlockiv @268
+ glGetActiveUniformBlockName @269
+ glUniformBlockBinding @270
+ glDrawArraysInstanced @271
+ glDrawElementsInstanced @272
+ glFenceSync @273
+ glIsSync @274
+ glDeleteSync @275
+ glClientWaitSync @276
+ glWaitSync @277
+ glGetInteger64v @278
+ glGetSynciv @279
+ glGetInteger64i_v @280
+ glGetBufferParameteri64v @306
+ glGenSamplers @281
+ glDeleteSamplers @282
+ glIsSampler @283
+ glBindSampler @284
+ glSamplerParameteri @285
+ glSamplerParameteriv @286
+ glSamplerParameterf @287
+ glSamplerParameterfv @288
+ glGetSamplerParameteriv @289
+ glGetSamplerParameterfv @290
+ glVertexAttribDivisor @291
+ glBindTransformFeedback @292
+ glDeleteTransformFeedbacks @293
+ glGenTransformFeedbacks @294
+ glIsTransformFeedback @295
+ glPauseTransformFeedback @296
+ glResumeTransformFeedback @297
+ glGetProgramBinary @299
+ glProgramBinary @300
+ glProgramParameteri @301
+ glInvalidateFramebuffer @210
+ glInvalidateSubFramebuffer @302
+ glTexStorage2D @303
+ glTexStorage3D @304
+ glGetInternalformativ @308
+
+ libGLESv2_swiftshader
